about summary refs log tree commit diff
path: root/config/settings.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-30 18:24:38 -0600
committerGitHub <noreply@github.com>2017-12-30 18:24:38 -0600
commitd817c0a958efda990af654f72d15d6f42b43dd49 (patch)
tree0cff3632163fadeba3585f56ecdd8d1d919e12c7 /config/settings.yml
parent65c87ca0ae20eb5dc62751047bda3e8b11e37ce0 (diff)
parent4cca1d1e7efce51eecb64489f412a7b8631f0aed (diff)
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
Diffstat (limited to 'config/settings.yml')
-rw-r--r--config/settings.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/settings.yml b/config/settings.yml
index dbc5f6a26..507b7c066 100644
--- 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