diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-08-27 15:28:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-27 15:28:00 +0200 |
commit | e7e04b46d750f5e2addfd9650991727101d76910 (patch) | |
tree | fadaf4a6f310a90d416b4c5ae6265c5e9f1c787b /app/models/setting.rb | |
parent | 70909c5b094523b0cf77123a2566310b2f148e24 (diff) | |
parent | 39193be1c464675ce9f51fc838a0e41264f23604 (diff) |
Merge pull request #1591 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/setting.rb')
0 files changed, 0 insertions, 0 deletions