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/cypress.json
+++ b/cypress.json
@@ -0,0 +1,7 @@
+{
+  "baseUrl": "http://nextcloud.local/index.php/",
+  "projectId": "hx9gqy",
+  "viewportWidth": 1280,
+  "viewportHeight": 720,
+  "experimentalSessionSupport": true
+}