diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-02 11:57:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 11:57:52 +0200 |
| commit | cf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch) | |
| tree | 29c156a7d145f2ec88e4bb708d329202598bdf35 /app/controllers/admin/settings_controller.rb | |
| parent | 71b318dedc5f39382cb15250417429427a69166b (diff) | |
| parent | bf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff) | |
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index 75d00326c..3234b194f 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -6,6 +6,7 @@ module Admin site_contact_username site_contact_email site_title + site_short_description site_description site_extended_description site_terms |