diff options
author | David Yip <yipdw@member.fsf.org> | 2017-09-10 13:04:27 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-10 13:04:27 -0500 |
commit | 932571fa22273e6ff5c229147668c426b4d65326 (patch) | |
tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /config/settings.yml | |
parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
parent | ab71cf4593ed3259168c641d5f4f5a0ebbe4d045 (diff) |
Merge tag 'v1.6.0' into sync/upstream
Diffstat (limited to 'config/settings.yml')
-rw-r--r-- | config/settings.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/settings.yml b/config/settings.yml index acaab3166..39dfb8f55 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -41,6 +41,7 @@ defaults: &defaults - root - webmaster - administrator + bootstrap_timeline_accounts: '' development: <<: *defaults |