mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 13:19:01 +09:00
bfeac6747a
Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers. |
||
---|---|---|
.. | ||
config.yml |