mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-05 21:15:58 +00:00
5085559b15
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
application_helper.rb | ||
flashes_helper.rb | ||
home_helper.rb | ||
instance_helper.rb | ||
jsonld_helper.rb | ||
routing_helper.rb | ||
settings_helper.rb | ||
stream_entries_helper.rb |