diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-09 19:06:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 19:06:13 +0100 |
| commit | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (patch) | |
| tree | dba9599f5416483c4a9fcad0002e5a2d6bcd4de1 /app/views/settings/preferences/other/show.html.haml | |
| parent | 25f725d67a6d2542cd586ab7c56baca572eb4f88 (diff) | |
| parent | 7d0e45a3be167d95cbc4d5f80fa989a9371802ae (diff) | |
Merge pull request #1472 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings/preferences/other/show.html.haml')
0 files changed, 0 insertions, 0 deletions