6 commits

Author	SHA1	Message	Date
Álvaro Brey Vilas	516544115c	Fix screenshot tests after subproject change ... Signed-off-by: Álvaro Brey Vilas <alvaro.brey@nextcloud.com>	2022-03-11 11:14:46 +01:00
Tobias Kaminsky	a639e8441c	Merge pull request #9043 from nextcloud/updateScreenshotsTests ... Update screenshots tests	2022-01-12 08:57:22 +01:00
Andy Scherzinger	b00d9d4975	Update screenshots ... Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>	2021-02-24 15:33:22 +01:00
tobiasKaminsky	cc6be5f2f0	Show folder name in resolve conflict dialog ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-11-24 22:40:26 +01:00
tobiasKaminsky	d34b1e8da7	Upload are deleted after decision was made in conflict activity ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-10-29 08:22:34 +01:00
tobiasKaminsky	db6c1ba055	new screenshots, disabled non working ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2020-07-15 15:42:26 +02:00