Merge branch 'patch-3' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 29 Jun 2019 06:01:33 +0000 (06:01 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 29 Jun 2019 06:01:33 +0000 (06:01 +0000)
commitb6cfc8f98b06f0fcf66881db063854b5cc1c4b27
tree159b682e4501af0fe7b6ce25a2a3af2d1c65b122
parentb20b2d862abb6d8267827123e7cd4943a29a8d55
parentab6de9b478bf9c2b46603c2761fd99b6506f8b08
Merge branch 'patch-3' into 'develop'

Move all upload contents despite upload folder itself.

See merge request pleroma/pleroma!1352
docs/installation/migrating_from_source_otp_en.md