Signed-off-by: Luka Trovic <luka@nextcloud.com> fix: conflicts Signed-off-by: Luka Trovic <luka@nextcloud.com> fix: conflicts and test issues Signed-off-by: Luka Trovic <luka@nextcloud.com>
Signed-off-by: Luka Trovic <luka@nextcloud.com> fix: conflicts Signed-off-by: Luka Trovic <luka@nextcloud.com> fix: conflicts and test issues Signed-off-by: Luka Trovic <luka@nextcloud.com>