diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
| commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
| tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/models/form | |
| parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
| parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) | |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form')
| -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 8a39e09b7..34c75e3bf 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -46,6 +46,8 @@ class Form::AdminSettings :preview_sensitive_media=, :custom_css, :custom_css=, + :profile_directory, + :profile_directory=, to: Setting ) |