diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-12-19 13:52:54 +0100 |
| commit | ab5ff638f2968e3f434e504c7caab370bf71c9c0 (patch) | |
| tree | 172f2c2fc8192688b960dd2bd42ea126ad9245fb /app/models/backup.rb | |
| parent | 66ab1f83b0d342341181e0c88da83c966391fc0c (diff) | |
| parent | 902c6bed5aab12c2e97af3452f122247777226af (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc
Diffstat (limited to 'app/models/backup.rb')
| -rw-r--r-- | app/models/backup.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/backup.rb b/app/models/backup.rb index c2651313b..8eeb1748a 100644 --- a/app/models/backup.rb +++ b/app/models/backup.rb @@ -7,7 +7,7 @@ # user_id :bigint(8) # dump_file_name :string # dump_content_type :string -# dump_file_size :integer +# dump_file_size :bigint # dump_updated_at :datetime # processed :boolean default(FALSE), not null # created_at :datetime not null |