diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-20 15:00:22 +0100 |
| commit | 45709d6987db87b38e5a16c18ea3b2d9e55fba98 (patch) | |
| tree | 854dcee1c7c85f518f46616f1a2b6af87df77c5b /public/emoji/26be.svg | |
| parent | ddcf78d8d3e2a8cb9aa04f8ff42f9d8e185b0354 (diff) | |
| parent | 51182843d49d04621c3d3069f44f365fd9f415e5 (diff) | |
Merge branch 'master' into glitch-soc/master
Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.
Diffstat (limited to 'public/emoji/26be.svg')
0 files changed, 0 insertions, 0 deletions