diff options
| author | ThibG <thib@sitedethib.com> | 2018-11-29 21:47:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 21:47:18 +0100 |
| commit | b65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (patch) | |
| tree | 4ec696e3bfd7406b0fbe54f71aed649241663ecf /app/views/admin/settings | |
| parent | 6a264c9379a50cb94afc8dd369bfc5b626a9c4d1 (diff) | |
| parent | ad7a3974cc48946b5cb8182da4f9e236aa5e39a1 (diff) | |
Merge pull request #835 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/settings')
0 files changed, 0 insertions, 0 deletions