Merge branch 'develop' into release-docs
authorrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)
committerrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 23:00:18 +0000 (02:00 +0300)
commit452d5d32317ef204c465ea56c341c86ab59bd171
treea9b612cf4ed8a422c421ef0c7613e9ef971b72ab
parent743bd648832eb1fd6033c3484059c08f88af40f3
parent55742d978d15bba75bcae9c6f2d91afbb77d0dc5
Merge branch 'develop' into release-docs
lib/mix/tasks/pleroma/instance.ex