Merge branch 'develop' into '2435-list-multiple-users'
authorlain <lain@soykaf.club>
Tue, 26 Jan 2021 14:24:32 +0000 (14:24 +0000)
committerlain <lain@soykaf.club>
Tue, 26 Jan 2021 14:24:32 +0000 (14:24 +0000)
commit229acae6c3da541ebb0438cb7f310cdce1df92b3
tree8b93f46ac090021e7e53db392ba54a3c48b31fda
parent71166b30a42ad3a8988049992bcab93c7e2ed656
parent250e2020987b1fc65251ba9564e41b38ba060391
Merge branch 'develop' into '2435-list-multiple-users'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md