Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sun, 17 Jun 2018 10:33:08 +0000 (10:33 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sun, 17 Jun 2018 10:33:08 +0000 (10:33 +0000)
commit25946f772d1c1d3ff8a4d2c70824654a9c22fc23
tree55532bebced4fc19c928b094331772ae3fb9ec00
parent1ea4a18ad859600841860cdd1a981da868aa18a0
parent394d0c94c431d8289893391b6d50cc079807567e
Merge branch 'patch-2' into 'develop'

Comment for Old Servers

See merge request pleroma/pleroma!224