forked from treehouse/mastodon
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. |
||
|---|---|---|
| .. | ||
| confirmations_controller.rb | ||
| omniauth_callbacks_controller.rb | ||
| passwords_controller.rb | ||
| registrations_controller.rb | ||
| sessions_controller.rb | ||