Merge branch 'fix-test' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 20:24:58 +0000 (20:24 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 17 Dec 2018 20:24:58 +0000 (20:24 +0000)
commit7d9254fb4aa17d0b6a7f5358fb5bc7a0406d1a30
tree9345930c5f7b851ffb34afc7c71617cd83ca4834
parent3d980daa49e51c7e3ec1f019e2b68c8108b37c76
parent52bda3b456528e14bb9765660aa957d31f41e54c
Merge branch 'fix-test' into 'develop'

Fix uploads test.

See merge request pleroma/pleroma!564