Jonas Mayer bb27d01dc5 Fix notification conflict not resolvable also on master ... Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>		2024-01-27 12:45:33 +01:00
..
androidTest	Remove empty java file	2024-01-27 12:45:33 +01:00
debug	Rebase master	2024-01-27 12:45:33 +01:00
generic	Rebase master	2024-01-27 12:45:33 +01:00
gplay	Update icon to Google Material one, improve layouting, make available for any build	2023-11-21 10:38:42 +01:00
huawei	Fix huawei flavour build	2023-11-20 11:19:51 +01:00
main	Fix notification conflict not resolvable also on master	2024-01-27 12:45:33 +01:00
qa	unify and align launched foreground vector files	2023-08-03 18:24:01 +02:00
release/java/com/nextcloud/client/di	Move app source to subproject	2022-03-11 11:10:51 +01:00
test	Fix imports	2024-01-27 12:45:33 +01:00
versionDev	unify and align launched foreground vector files	2023-08-03 18:24:01 +02:00