Merge branch 'master' into dashboard-master

This commit is contained in:
decabeza
2018-10-19 01:48:37 +02:00
1586 changed files with 126348 additions and 9884 deletions

View File

@@ -47,8 +47,8 @@ section "Creating Settings" do
Setting.create(key: 'feature.allow_images', value: "true")
Setting.create(key: 'feature.allow_attached_documents', value: "true")
Setting.create(key: 'feature.public_stats', value: "true")
Setting.create(key: 'feature.guides', value: nil)
Setting.create(key: 'feature.user.skip_verification', value: "true")
Setting.create(key: 'feature.help_page', value: "true")
Setting.create(key: 'per_page_code_head', value: "")
Setting.create(key: 'per_page_code_body', value: "")