diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-07 13:45:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-07 13:45:43 +0100 |
| commit | 38e9c66f34d7054357a3de63834f182734d43d75 (patch) | |
| tree | 0f46795c03e883893ce01170a969f51189505d32 /app/views/admin/settings/edit.html.haml | |
| parent | 84c807a0dcdfd6c3c18ee37fcb5003a92a92ce3f (diff) | |
| parent | 9c5e7805ccfc9b065aba7831f912287e02aeb1bb (diff) | |
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/settings/edit.html.haml')
0 files changed, 0 insertions, 0 deletions