Attempt to resolve merge conflict
authorrinpatch <rinpatch@sdf.org>
Sat, 1 Dec 2018 15:12:27 +0000 (18:12 +0300)
committerrinpatch <rinpatch@sdf.org>
Sat, 1 Dec 2018 15:12:27 +0000 (18:12 +0300)
commitfe2759bc9f2dad044b49f4954693ac09f9368041
tree59dd9c5026f433d976defa303de0d6782d435d1e
parentba6e3eba33f16bdd2fede086d5fb5c86201cb57b
parent8c3ff06e35e11a40cf4eb35a41a2019b7496e62c
Attempt to resolve merge conflict
README.md
lib/mix/tasks/pleroma/sample_config.eex