diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-05 19:23:16 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-05 19:23:16 +0100 |
| commit | f513317ba262d9f5d7aa7dd66f8b61690297e107 (patch) | |
| tree | 6732fcf1178fc3e27404c6830bc2bc1c832659ae /public/emoji/1f1e7-1f1f7.svg | |
| parent | 2a4ce7458a16c64029842fde210089453be2ede1 (diff) | |
| parent | 7d5e2dda78414316f9cf09fcf6096d6a158da312 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
Diffstat (limited to 'public/emoji/1f1e7-1f1f7.svg')
0 files changed, 0 insertions, 0 deletions