projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ff583e fc13a3f)
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 10 Apr 2018 14:46:04 +0000 (14:46 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 10 Apr 2018 14:46:04 +0000 (14:46 +0000)
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec

See merge request pleroma/pleroma!104


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