mirror of
https://github.com/funamitech/mastodon
synced 2024-12-11 21:29:17 +09:00
5cadb47238
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code |
||
---|---|---|
.. | ||
about.js | ||
application.js | ||
common.js | ||
error.js | ||
public.js | ||
share.js |