diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-25 18:05:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 18:05:52 +0100 |
| commit | 9ee8e1add9f937a75c2514ca88958ff02cf5573c (patch) | |
| tree | e6c97dfd5a14860b9c825b1c84fb1dd84ada6581 /app/models/setting.rb | |
| parent | 0d41fef50618e3d58255b4f4082326e83ff06982 (diff) | |
| parent | 2f2b48b227304d0f0a28dd4867e84af10b8097ad (diff) | |
Merge pull request #1289 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/setting.rb')
0 files changed, 0 insertions, 0 deletions