Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Fri, 27 Apr 2018 05:49:12 +0000 (05:49 +0000)
committerlambda <pleromagit@rogerbraun.net>
Fri, 27 Apr 2018 05:49:12 +0000 (05:49 +0000)
commit39c80a3667afec25a187894d67e0d0e9b8713eb1
tree4f66157f8444b2b0f3dd113742d622a002d8af70
parent6eb274f278e2a02fdba244072db8202de4030bf4
parent90bbd946145ad5d622044fea396b7d5d4a14f575
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'

ActivityPub MRF SimplePolicy: fix media stripping

See merge request pleroma/pleroma!133