Merge branch 'develop' into 'issue/2115'
authorlain <lain@soykaf.club>
Wed, 23 Sep 2020 11:49:19 +0000 (11:49 +0000)
committerlain <lain@soykaf.club>
Wed, 23 Sep 2020 11:49:19 +0000 (11:49 +0000)
commit436d1a3c41fc92183efffb81cc041ca270025d02
treea5a8cbe6911ef067c3d38a360897b390f6a855ff
parentdf1eb5cf7ee6d718a28fca3d3715f11ab0e263cb
parenta5e1c400e49e7979e70f2c9dd4887ae144dca44c
Merge branch 'develop' into 'issue/2115'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md