mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-11-01 13:04:49 +00:00
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 | ||