Merge branch 'develop' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Wed, 11 Apr 2018 20:58:25 +0000 (20:58 +0000)
committerlambda <pleromagit@rogerbraun.net>
Wed, 11 Apr 2018 20:58:25 +0000 (20:58 +0000)
commit3d636cf533e7e73f35d1837bcc70e8d9f4306b37
treee40113699d2ce459998dcbe27596c4a14b10d7f6
parent5612716c25fa442f06a08083d945e421840300fe
parent2de2e29df2a0359fe87337111866b46efb848b7d
Merge branch 'develop' into 'develop'

Fix issue #124

Closes #124

See merge request pleroma/pleroma!108