Merge branch 'revert-4d3655c4' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Thu, 31 Jan 2019 12:16:44 +0000 (12:16 +0000)
committerlambda <pleromagit@rogerbraun.net>
Thu, 31 Jan 2019 12:16:44 +0000 (12:16 +0000)
commitbd89cdbe318ce12e0273163a51f2907e6e763be6
tree27959dec7a5ae46c194ed7b47156e4877a736a0b
parent4d3655c47959d7b9bfb3eb7316a8b7ad9010288e
parenta43a1c6d4e6ff26c751cce1284deb2ef40b00ab7
Merge branch 'revert-4d3655c4' into 'develop'

Revert "Merge branch 'spc-fix-3' into 'develop'"

See merge request pleroma/pleroma!745