diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-16 16:28:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 16:28:38 +0100 |
| commit | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (patch) | |
| tree | e074e7b778e973b12e754d939cc5e2805eb012d6 /app/models/setting.rb | |
| parent | 077639c27409f897e87522dd18a51801b6cbc40d (diff) | |
| parent | 5684cd090caec27729d78c204911348a0cf62cbf (diff) | |
Merge pull request #887 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/setting.rb')
0 files changed, 0 insertions, 0 deletions