diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:49:25 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:49:25 +0200 |
| commit | 032a6696227edc8f55d07d0243c10e11d6ac18da (patch) | |
| tree | 154f456d621dbf8177a5ddbf6039a13e12850696 /app/javascript/flavours | |
| parent | 356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (diff) | |
| parent | e9a11dca1977308bd2b367362cde512fe093b3f7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/admin/settings/edit.html.haml Conflict on theme VS flavour/skin handling. Keep our version.
Diffstat (limited to 'app/javascript/flavours')
0 files changed, 0 insertions, 0 deletions