fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-05-09 11:51:39 +01:00
parent 43540b008c
commit 37b3f03809
8 changed files with 2756 additions and 220 deletions
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
 		"@nextcloud/vue": "^5.3.1",
 		"@nextcloud/vue-dashboard": "^2.0.1",
 		"blueimp-md5": "^2.19.0",
+		"cypress": "^9.5.3",
 		"dompurify": "^2.3.6",
 		"lodash": "^4.17.21",
 		"markdown-it": "^13.0.1",