projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67cc4dc 15d36b7)
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)
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"

See merge request pleroma/pleroma!2276


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git