Francesco Mangiacrapa 4407711fe6 Merged manually against the `task_24166` to resolve conflicts		2023-05-12 10:57:02 +02:00
..
java/org/gcube/portlets/user/geoportaldataentry	Merged manually against the `task_24166` to resolve conflicts	2023-05-12 10:57:02 +02:00
resources/org/gcube/portlets/user/geoportaldataentry	refactored gwt.version	2022-09-28 09:59:13 +02:00
webapp	merged manually some files to resolve conflicts with `task_24166`	2023-05-12 10:55:03 +02:00