diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-10 14:10:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 14:10:30 -0500 |
| commit | 7a9c7d4e0b694e716cb018e3057792b4d86026fa (patch) | |
| tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /app/models | |
| parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
| parent | 932571fa22273e6ff5c229147668c426b4d65326 (diff) | |
Merge pull request #143 from yipdw/sync/upstream
Merge with upstream's 1.6.0
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/form/admin_settings.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index c3a04ba65..2b148c82b 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -24,6 +24,8 @@ class Form::AdminSettings :open_deletion=, :timeline_preview, :timeline_preview=, + :bootstrap_timeline_accounts, + :bootstrap_timeline_accounts=, to: Setting ) end |