Merge tag 'v1.6.0' into sync/upstream

2017-09-10 13:04:27 -05:00
parent c9df53044a ab71cf4593
commit 932571fa22
26 changed files with 175 additions and 49 deletions
@@ -41,6 +41,7 @@ defaults: &defaults
    - root
    - webmaster
    - administrator
+  bootstrap_timeline_accounts: ''

 development:
  <<: *defaults