Merge branch 'move-sample-configs' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 17:27:00 +0000 (17:27 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 17:27:00 +0000 (17:27 +0000)
commit6906db512dee7aa041b98c25312dabafd43ad932
tree1fc7f2098a560d2ddf304148d51ae149ea3a0048
parent2437f5128407bbcdfc152ea3f008d7eecc1728f2
parente76115989a0867d5a37a869b560153c2e7c060fd
Merge branch 'move-sample-configs' into 'develop'

Move config templates to priv so they can be found in releases

See merge request pleroma/pleroma!1318