projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25946f7 a2c6778)
Merge branch 'bugfix/as2-contentmap' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 19 Jun 2018 05:13:00 +0000 (05:13 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 19 Jun 2018 05:13:00 +0000 (05:13 +0000)
handle ActivityStreams 2.0 contentMap

See merge request pleroma/pleroma!229


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