diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-27 15:46:50 +0100 |
| commit | c56a504d116d62fe669d15a270133d7c78dd61f1 (patch) | |
| tree | 7400f3182f2a4ebd1606c37a1a5cad4cc95e443b /public/emoji/1f469-200d-2695-fe0f.svg | |
| parent | 8924743349ec5ce37cd949445e071c14968ec2ec (diff) | |
| parent | c2dfd5e4e24a70fbfa02678fde4cfc6f6750deb4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.
Diffstat (limited to 'public/emoji/1f469-200d-2695-fe0f.svg')
0 files changed, 0 insertions, 0 deletions