Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)
commita1869f5272ddd83cdf2b2fc487668de79f2d0c6d
treedef42bef14e8ced310471a194080e38cbee15452
parent16e598ec11cb9178b9fc53a1ec4b649d97c5f3b8
parentf8aa917eef9280631a5cd2c95cf1db8fab6e14e5
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
lib/mix/tasks/pleroma/user.ex
lib/pleroma/user.ex