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)
commitde80363518d7f5118cef6528e64fd12a574707a6
tree83d862f24a565ec8fb3cda74154423e35d40c1fe
parent25946f772d1c1d3ff8a4d2c70824654a9c22fc23
parenta2c6778ce699401ee2c872122618d6727105c0d1
Merge branch 'bugfix/as2-contentmap' into 'develop'

handle ActivityStreams 2.0 contentMap

See merge request pleroma/pleroma!229