Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 3 Feb 2020 18:42:36 +0000 (21:42 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 3 Feb 2020 18:42:36 +0000 (21:42 +0300)
commit2c40c8b4a2890e60abe8d67a3c8af4a88d225b60
treebe7ff77c4af8b1264c57e8aa8161e80396ca3fbc
parent21a2a054070c26d7be1a0e453e5f40b20fbd59f2
parentc27d1d65bfd60effdb45359697141c136e156177
Merge branch 'develop' into issue/1383
config/config.exs
docs/configuration/cheatsheet.md
lib/pleroma/application.ex