merge resolved

This commit is contained in:
2019-08-21 14:25:21 +02:00
31 changed files with 600 additions and 207 deletions