diff options
| author | ThibG <thib@sitedethib.com> | 2020-06-24 17:06:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 17:06:26 +0200 |
| commit | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (patch) | |
| tree | 89b283a87f3ff82b24148636594c0837aa34b322 /app/views/admin/instances/show.html.haml | |
| parent | 5d12b63e79953a7596ae473706985b774d4e51a6 (diff) | |
| parent | 72d193654b9369b43090a4de2e197c21c30f3f31 (diff) | |
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/instances/show.html.haml')
0 files changed, 0 insertions, 0 deletions