cde0ac1aa7
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. |
||
---|---|---|
.. | ||
accounts_cli.rb | ||
cli_helper.rb | ||
domains_cli.rb | ||
emoji_cli.rb | ||
feeds_cli.rb | ||
media_cli.rb | ||
migration_helpers.rb | ||
premailer_webpack_strategy.rb | ||
redis_config.rb | ||
search_cli.rb | ||
settings_cli.rb | ||
snowflake.rb | ||
statuses_cli.rb | ||
version.rb |