diff options
| author | feld <feld@feld.me> | 2020-03-06 16:03:24 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-03-06 16:03:24 +0000 |
| commit | 46f118d7e1d570fa4f4d1235f9c38c6040f814fb (patch) | |
| tree | e24860f0c1c3e1ff77fd9771695bb3ba53b6e97d /lib | |
| parent | 67cc4dceb517b69323448277ec02dfd048ff927a (diff) | |
| parent | 15d36b7f5f96932f4beece55fc299871fa0a97e4 (diff) | |
| download | pleroma-46f118d7e1d570fa4f4d1235f9c38c6040f814fb.tar.gz | |
Merge branch 'revert-67cc4dce' into 'develop'
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions