Merge branch 'feature/follow-import' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 18 Dec 2017 10:59:57 +0000 (10:59 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 18 Dec 2017 10:59:57 +0000 (10:59 +0000)
commit6b48489237f85ec8b6a9a98c539e0aad68d3a601
treec0b895959fb451000f0f6b7ef7fa5a22965f502c
parent9223038319f0281f104fb9bb85c0cb8f6e52984a
parentfdfb508259f45154313df0ae343ee6ca26802505
Merge branch 'feature/follow-import' into 'develop'

Add follow import.

See merge request pleroma/pleroma!40