Luka Trovic 3ce8041a12 fix: resolve merge conflicts ...

Signed-off-by: Luka Trovic <luka@nextcloud.com>

2022-05-09 12:07:02 +01:00

..

fixtures

fix: resolve merge conflicts

2022-05-09 11:51:39 +01:00

integration

fix: resolve merge conflicts

2022-05-09 12:07:02 +01:00

plugins

fix: resolve merge conflicts

2022-05-09 11:51:39 +01:00

support

tests: add cypress tests for deck dashboard, boards, lists, cards

2022-05-09 12:05:43 +01:00

utils

fix: solve merge conflicts

2022-05-09 12:04:34 +01:00