mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-04 20:45:13 +00:00
16ff7c5627
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb |
||
---|---|---|
.. | ||
about.js | ||
application.js | ||
common.js | ||
error.js | ||
public.js | ||
share.js |