Wolfgang Huß 379f7d1ed7 Merge branch 'master' of https://github.com/Human-Connection/Human-Connection into 1455-fix-update-comment-list
# Conflicts:
#	webapp/components/Comment.vue
#	webapp/components/CommentForm/CommentForm.spec.js
#	webapp/components/CommentForm/CommentForm.vue
#	webapp/components/EditCommentForm/EditCommentForm.vue
#	webapp/store/editor.js
2019-09-11 07:58:40 +02:00
..
2019-09-10 03:35:10 +02:00