mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 04:36:45 +00:00
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js. |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |