diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
| commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
| tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /public/emoji/269c.svg | |
| parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
| parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'public/emoji/269c.svg')
0 files changed, 0 insertions, 0 deletions