Merge branch 'blocks-in-user-view' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 8 Nov 2017 13:39:02 +0000 (13:39 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 8 Nov 2017 13:39:02 +0000 (13:39 +0000)
commit8bbbfd72aad7eccf0914019affbaa060a41b96b2
treea541bba28e8817aa975ac368fecd29c25ef90d76
parent3bbefd0a1e0c328bf6039060ceb4f7e7bdd21677
parent4656cb9b996169714e6a25c6025e96df81a34b62
Merge branch 'blocks-in-user-view' into 'develop'

TwitterAPI user view: add blocks.

See merge request pleroma/pleroma!10