Merge branch 'develop' into issue/1280
authorMark Felder <feld@FreeBSD.org>
Sun, 26 Jan 2020 17:23:05 +0000 (11:23 -0600)
committerMark Felder <feld@FreeBSD.org>
Sun, 26 Jan 2020 17:23:05 +0000 (11:23 -0600)
commitd770cffce0aec0eeb427c8851437f04329700da9
tree8a6f4db2849e613e0be968d3c0edc605b7040563
parent108a39c8766402dcbd0235d8746e2100a18e5813
parentd9e2bd8f40b7d77713a72ef94da2fbe8ffa75b91
Merge branch 'develop' into issue/1280
lib/pleroma/web/oauth/oauth_controller.ex