Merge branch 'master' into dashboard-master

2018-10-19 01:48:37 +02:00
parent 5bb9225c52 3878946c9e
commit 546105d989
1586 changed files with 126348 additions and 9884 deletions
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -88,7 +88,7 @@ Setting['feature.community'] = true
 Setting['feature.map'] = nil
 Setting['feature.allow_images'] = true
 Setting['feature.allow_attached_documents'] = true
-Setting['feature.guides'] = nil
+Setting['feature.help_page'] = true

 # Spending proposals feature flags
 Setting['feature.spending_proposal_features.voting_allowed'] = nil