Merge branch 'feature/user_deletion' into develop
authorRoger Braun <roger@rogerbraun.net>
Sat, 9 Dec 2017 09:10:45 +0000 (10:10 +0100)
committerRoger Braun <roger@rogerbraun.net>
Sat, 9 Dec 2017 09:10:45 +0000 (10:10 +0100)

Trivial merge