mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-10-10 06:49:22 +00:00
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js |
||
---|---|---|
.. | ||
migrate | ||
post_migrate | ||
schema.rb | ||
seeds.rb |