mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02: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. |
||
---|---|---|
.. | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
identity_proofs | ||
imports | ||
migrations | ||
notifications | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentications |