Merge branch 'develop' into 'issue/1975'
authorlain <lain@soykaf.club>
Wed, 23 Sep 2020 09:16:00 +0000 (09:16 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Sep 2020 09:16:00 +0000 (09:16 +0000)
commita6c14041c49df0dc850204723cfc1f242ded8aa2
tree559fe96b7f65cd750a4bab5e9a117c43829c800f
parent518c0f2962ab36660157d7cbc995d1f4562728b3
parent34235bc02a88718b1d5a9d7fa2437784b91bb692
Merge branch 'develop' into 'issue/1975'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md