diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-15 17:07:49 +0200 |
| commit | 66ad30db489ddb2b3ecc98d284aabd47c9d4ae84 (patch) | |
| tree | d8f035139c20e59c39bb35a74686783094c297da /public/emoji/1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd.svg | |
| parent | 615073df33b9a4317ac5c93fdef83c9cd34567fa (diff) | |
| parent | 5524258da9bc1d62b1396d19c672d3a8335ffbc5 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `package.json`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it. - `yarn.lock`: No real conflict, upstream updated a dependency which is textually adjacent to a glitch-soc-specific dependency. Updated it.
Diffstat (limited to 'public/emoji/1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd.svg')
0 files changed, 0 insertions, 0 deletions