diff options
author | ThibG <thib@sitedethib.com> | 2020-04-02 22:17:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-02 22:17:29 +0200 |
commit | 5c5317041f17375666bfaf4788f0adf71804b47d (patch) | |
tree | 4dfa61cff64d1f2477bcbf914e16b25fd2953386 /app/models/web/setting.rb | |
parent | a192b193bdf7013df09c6cd63916274cd9d47cf7 (diff) | |
parent | b367dd713e5b97d79d52e9cb67042eadb241d032 (diff) |
Merge pull request #1310 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/web/setting.rb')
0 files changed, 0 insertions, 0 deletions