Merge branch 'develop' into 'fix/notifsettings-breaking-login'
authorfeld <feld@feld.me>
Thu, 15 Apr 2021 14:59:26 +0000 (14:59 +0000)
committerfeld <feld@feld.me>
Thu, 15 Apr 2021 14:59:26 +0000 (14:59 +0000)
commit0a7c2a32badc8520d90146d5a1aae7907a679614
tree13a41747e2452ec5d3bf6128b090c37257985f2c
parent765f0907dfa9371038188ee35fc3b241be796d26
parent0ba8efc9500d55a3e26a8f0a66a8f425b1436881
Merge branch 'develop' into 'fix/notifsettings-breaking-login'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md