Merge remote-tracking branch 'origin/develop'

# Conflicts: # src/app/openaireLibrary
commit libraries
2024-06-13 11:26:26 +03:00 · 2024-02-15 12:28:43 +02:00 · 2024-02-15 12:15:18 +02:00 · 2023-11-08 10:38:23 +02:00 · 2023-11-08 10:37:50 +02:00 · 2023-10-06 21:05:00 +03:00
3 changed files with 3 additions and 3 deletions
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@ -1 +1 @@
-Subproject commit e5a98845a76ffdaeeceaa7bd87f14fc427c7df29
+Subproject commit 2e2a71c3101660480ede67c06edc22aa00faa79d
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@ -1 +1 @@
-Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a
+Subproject commit 3b437aafda7a716a0a89785a106456cbe520dce3
--- a/src/assets/openaire-theme
+++ b/src/assets/openaire-theme
@ -1 +1 @@
-Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9
+Subproject commit 99ab54cdd7b973a2ba047f0a6b37667270b58439
Author	SHA1	Message	Date
argirok	f427350d71	Merge remote-tracking branch 'origin/develop' # Conflicts: # src/app/openaireLibrary	2024-06-13 11:26:26 +03:00
argirok	a3d67696ad	commit libraries	2024-02-15 12:28:43 +02:00
argirok	d2384ea07f	Merge branch 'develop'	2024-02-15 12:15:18 +02:00
argirok	b5c60f85e9	Merge branch 'develop'	2023-11-08 10:38:23 +02:00
argirok	a767a1d890	commit libraries	2023-11-08 10:37:50 +02:00
argirok	3c46fb9459	Merge branch 'master' of code-repo.d4science.org:MaDgIK/connect-admin	2023-10-06 21:05:00 +03:00
argirok	63521a83aa	commit libraries	2023-10-06 21:04:40 +03:00
Konstantinos Triantafyllou	4365aab4bb	Merge from Develop. Resolve (Connect Admin release 30th August 2023 #3 )	2023-08-30 13:53:28 +03:00
Konstantina Galouni	82eec379f2	Updating libraries before prod release	2023-06-23 16:24:48 +03:00
Konstantinos Triantafyllou	946c4f62c4	Update library before release	2023-06-20 09:41:41 +03:00
Konstantinos Triantafyllou	58688d67de	Merge pull request 'Connect-Admin release 19th June 2023' (#2 ) from develop into master Reviewed-on: #2	2023-06-20 08:37:42 +02:00
Konstantina Galouni	41d7882e61	Merge remote-tracking branch 'origin/develop'	2023-05-26 15:49:26 +03:00
Konstantina Galouni	6c10e2f397	Updating openaireLibrary before release	2023-05-26 15:48:43 +03:00
Konstantinos Triantafyllou	f98a3e9550	Resolved Connect-Admin release 25th May 2023 #1	2023-05-25 17:37:38 +03:00
Konstantinos Triantafyllou	5123efc8c4	Update libraries before production deployment	2023-04-21 12:35:48 +03:00