Wolfgang Huß 2d73a54819 Merge branch 'master' of github.com:Human-Connection/Human-Connection into 1709-send-feedbacks-in-report-processes
# Conflicts:
#	webapp/components/Notification/Notification.vue
#	webapp/components/NotificationsTable/NotificationsTable.vue
2020-01-22 10:12:35 +01:00
..
2019-12-17 20:20:16 +01:00