mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 22:26:54 +00:00
5e11f3a6e1
Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes. |
||
|---|---|---|
| .. | ||
| admin | ||
| settings | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| domain_control_helper.rb | ||
| flashes_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| jsonld_helper.rb | ||
| mascot_helper.rb | ||
| routing_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| webfinger_helper.rb | ||