diff options
author | ThibG <thib@sitedethib.com> | 2021-01-18 14:37:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-18 14:37:57 +0100 |
commit | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (patch) | |
tree | c8f898f74d17137205f5324f8189c71f36bf913b /app/models/form/admin_settings.rb | |
parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) | |
parent | e202314a75d3277c26f151764ff183d61dd2f9d0 (diff) |
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form/admin_settings.rb')
0 files changed, 0 insertions, 0 deletions