Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Mon, 9 Dec 2019 16:41:43 +0000 (19:41 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Mon, 9 Dec 2019 16:41:43 +0000 (19:41 +0300)
1  2 
lib/pleroma/application.ex

Simple merge