mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 17:05:17 +00:00
3550470c18
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours. |
||
|---|---|---|
| .. | ||
| migrate | ||
| schema.rb | ||
| seeds.rb | ||