Merge branch 'patch-2' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 5 Feb 2019 11:29:20 +0000 (11:29 +0000)
commit040ab352a543bdaa7ac4c078db0fc24f0db37d5a
tree344e6ee3861f94e586cf4d7d3ce89b98926baa8b
parent8892f4468c474f169039977b62af1b524a413bf5
parent47eb557617ce1e74781a7d232fcfd92d2b32264a
Merge branch 'patch-2' into 'develop'

ARGLE GARBLE

See merge request pleroma/pleroma!776