fix: merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
2022-12-20 21:34:10 +01:00
parent 67adda5f84
commit 21c4955001
4 changed files with 34 additions and 4 deletions
--- a/lib/Capabilities.php
+++ b/lib/Capabilities.php
@@ -53,7 +53,8 @@ class Capabilities implements ICapability {
 				'canCreateBoards' => $this->permissionService->canCreate(),
 				'apiVersions' => [
 					'1.0',
-					'1.1'
+					'1.1',
+					'1.2'
 				]
 			]
 		];