Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30 17:20:07 -06:00
parent e4944d065b f4b80e6511
commit 4cca1d1e7e
23 changed files with 190 additions and 27 deletions
--- a/config/settings.yml
+++ b/config/settings.yml
@ -49,7 +49,8 @@ defaults: &defaults
    - webmaster
    - administrator
  bootstrap_timeline_accounts: ''
-
+  activity_api_enabled: true
+  peers_api_enabled: true
 development:
  <<: *defaults