Merge develop
authorRin Toshaka <rinpatch@sdf.org>
Thu, 6 Dec 2018 17:11:22 +0000 (18:11 +0100)
committerRin Toshaka <rinpatch@sdf.org>
Thu, 6 Dec 2018 17:11:22 +0000 (18:11 +0100)
commit88f92693f25c34f8ab82d4ed809b266bf5fb9ff8
treed6115e451d0cd98672669c6ba93921f75f21e16a
parentca7b46fb3ba576fb7e67eba02654e6df9299392a
parent1d531fd2f32a7f8fff562a3122b30b8ccdccead0
Merge develop
lib/mix/tasks/pleroma/sample_config.eex