Merge branch 'bugfix/hubzilla-compat' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 19 May 2018 09:17:04 +0000 (09:17 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 19 May 2018 09:17:04 +0000 (09:17 +0000)
commit125d934bc6d8121f600e7fde9aae0a767f6aa66e
tree5ba75e7e156daf3be270d4dba47046b941b4ea9c
parent1d4bbec6b3239bb83b500a6a90e6686cb682cfac
parent6e8de2faae46f3dcaf6881ab40664da0057551e4
Merge branch 'bugfix/hubzilla-compat' into 'develop'

hubzilla compatibility

Closes #100

See merge request pleroma/pleroma!160