diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-07 22:26:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-07 22:26:10 +0200 |
| commit | fce885f271f8651702d606406e21677280071e40 (patch) | |
| tree | 2ebb76c77088edf0662ef333523ef0f0a03b6c4e /spec/controllers/settings | |
| parent | e5f4d83e60305e2f502f18f507ad79d8fbccfe77 (diff) | |
| parent | 5ff9970c8d4acfb69b4696a3b5ce8e2a9580e370 (diff) | |
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/settings')
0 files changed, 0 insertions, 0 deletions