Merge branch 'revert-67cc4dce' into 'develop'
authorfeld <feld@feld.me>
Fri, 6 Mar 2020 16:03:24 +0000 (16:03 +0000)
committerfeld <feld@feld.me>
Fri, 6 Mar 2020 16:03:24 +0000 (16:03 +0000)
commit46f118d7e1d570fa4f4d1235f9c38c6040f814fb
treee24860f0c1c3e1ff77fd9771695bb3ba53b6e97d
parent67cc4dceb517b69323448277ec02dfd048ff927a
parent15d36b7f5f96932f4beece55fc299871fa0a97e4
Merge branch 'revert-67cc4dce' into 'develop'

Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276