about summary refs log tree commit diff
path: root/app/views/admin/settings/edit.html.haml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-09-10 13:04:27 -0500
committerDavid Yip <yipdw@member.fsf.org>2017-09-10 13:04:27 -0500
commit932571fa22273e6ff5c229147668c426b4d65326 (patch)
tree973b16e23a7cbeaf5a43550444e54aa1ace50a46 /app/views/admin/settings/edit.html.haml
parentc9df53044a333276853f7dc7ef2aed6d48df087f (diff)
parentab71cf4593ed3259168c641d5f4f5a0ebbe4d045 (diff)
Merge tag 'v1.6.0' into sync/upstream
Diffstat (limited to 'app/views/admin/settings/edit.html.haml')
-rw-r--r--app/views/admin/settings/edit.html.haml5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 9f8a6640b..50d019ec4 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -28,5 +28,10 @@
     = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 }
     = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 }
 
+  %hr/
+
+  .fields-group
+    = f.input :bootstrap_timeline_accounts, wrapper: :with_block_label, label: t('admin.settings.bootstrap_timeline_accounts.title'), hint: t('admin.settings.bootstrap_timeline_accounts.desc_html')
+
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit