about summary refs log tree commit diff
path: root/app/models/form
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-02 11:57:52 +0200
committerGitHub <noreply@github.com>2018-08-02 11:57:52 +0200
commitcf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /app/models/form
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parentbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff)
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form')
-rw-r--r--app/models/form/admin_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 723480bdd..010cf7fc3 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -10,6 +10,8 @@ class Form::AdminSettings
     :site_contact_email=,
     :site_title,
     :site_title=,
+    :site_short_description,
+    :site_short_description=,
     :site_description,
     :site_description=,
     :site_extended_description,