Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
2019-03-26 16:02:54 +01:00
parent 648cf8bfd5 0c1a05b281
commit b9f314bba7
161 changed files with 5988 additions and 2055 deletions
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -29,6 +29,7 @@ module Admin
      @hidden_service        = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
      @trending_hashtags     = TrendingTags.get(7)
      @profile_directory     = Setting.profile_directory
+      @timeline_preview      = Setting.timeline_preview
    end

    private