diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-23 22:10:51 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:01:59 +0100 |
| commit | fcce135d271276aa38576ed36a113ec3f6161e0a (patch) | |
| tree | f8faef20945cd7f114d8b718c46901fb10fd3c0f /public/emoji/1f469-200d-1f469-200d-1f467-200d-1f467.svg | |
| parent | 9f56511860493b770c2e535be0f8ce4777c8d373 (diff) | |
| parent | 9ec98893f4974bb022a722c3163a7e578b1d5ce9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.
Diffstat (limited to 'public/emoji/1f469-200d-1f469-200d-1f467-200d-1f467.svg')
0 files changed, 0 insertions, 0 deletions