amentis 63a8820681 Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring ... # Conflicts: # dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html		2023-11-29 15:32:03 +02:00
..
Docker	dockerization	2022-09-13 10:35:56 +03:00
core	Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring	2023-11-29 15:32:03 +02:00
data	elastic manage service	2023-11-21 13:15:31 +02:00
queryable	change queryable dependencies	2023-11-14 16:27:46 +02:00
web	add ordinal in Language Entity	2023-11-29 15:27:27 +02:00
Dockerfile	dockerization	2022-09-13 10:35:56 +03:00
Dockerfile.CI	no message	2023-10-12 10:57:38 +03:00
package-lock.json	changes	2017-10-18 11:29:22 +03:00
pom.xml	remove old elastic	2023-11-14 13:41:57 +02:00