Merge branch 'develop' into 'fix/extended-nickname-format-default-config'
authorfeld <feld@feld.me>
Fri, 4 Oct 2019 14:16:28 +0000 (14:16 +0000)
committerfeld <feld@feld.me>
Fri, 4 Oct 2019 14:16:28 +0000 (14:16 +0000)
commit31e57cd1b34798afb07a8de4c0c95ef3c15e22ed
tree461d3d50b855d080eb17f0946213168a87ac7625
parentb8b98ac40f042a8c3d2562edc095f0e1a309760f
parent27110793a7d8e3aa6434bde63a1f687424ae779c
Merge branch 'develop' into 'fix/extended-nickname-format-default-config'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md