Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 22 Jan 2020 06:30:30 +0000 (09:30 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 22 Jan 2020 06:30:30 +0000 (09:30 +0300)
commitb8d5c09f48a4b643f0dc60930bc69772a32a3b5e
tree59d1903f2d204b8a5e244430cb17ef772ced5f4e
parentb7908844f24f4ede4244261d43f30ed3724efbb7
parent71bffbf0b7a3f0e245408a977c48a51763021508
Merge branch 'develop' into issue/1383
config/config.exs
lib/pleroma/application.ex
mix.exs
mix.lock