Merge branch 'develop' into 'fix/oauth-compile-time'
authorlain <lain@soykaf.club>
Mon, 9 Dec 2019 13:52:01 +0000 (13:52 +0000)
committerlain <lain@soykaf.club>
Mon, 9 Dec 2019 13:52:01 +0000 (13:52 +0000)
commita5e28bf2145f068a264ba1eafc3dd3067672547d
tree09ff6654215ae81f9a50acc5d992ffd9680b10ca
parentbd3aa8500c64b769a36a75fefa445668dc8da4a6
parent49110f049855be9e7ac79ca228201db7de225388
Merge branch 'develop' into 'fix/oauth-compile-time'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md