Merge branch 'galaxyproject:main' into protTrans

galaxyproject · May 28, 2024 · 766adb2 · 766adb2
2 parents 6d0fac8 + bc27092
commit 766adb2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 0 deletions.
diff --git a/assets/css/images/marker-icon.png b/assets/css/images/marker-icon.png
diff --git a/assets/css/images/marker-shadow.png b/assets/css/images/marker-shadow.png
diff --git a/assets/images/GTN-event-logo.png b/assets/images/GTN-event-logo.png
diff --git a/assets/images/GTN-logo-alt.png b/assets/images/GTN-logo-alt.png
diff --git a/assets/images/tiaas.png b/assets/images/tiaas.png
diff --git a/events/images/TBCAPT_NGS_Training_banner.jpg b/events/images/TBCAPT_NGS_Training_banner.jpg
diff --git a/...15abff5ab29c23e1539327928ef0c1810426f.txt → ...01aa81c5ec76b5ff2dc3f47537549c8948f32.txt b/...15abff5ab29c23e1539327928ef0c1810426f.txt → ...01aa81c5ec76b5ff2dc3f47537549c8948f32.txt
@@ -1,3 +1,12 @@
+GTN_GTN:1716543878
+GTN_GTN:1716543791
+
+assets/css/images/marker-shadow.png
+GTN_GTN:1716542558
+GTN_GTN:1716540581
+
+metadata/git-mod-5df15abff5ab29c23e1539327928ef0c1810426f.txt
+metadata/git-pub-5df15abff5ab29c23e1539327928ef0c1810426f.txt
 GTN_GTN:1716540429
 GTN_GTN:1716539549
 

diff --git a/...15abff5ab29c23e1539327928ef0c1810426f.txt → ...01aa81c5ec76b5ff2dc3f47537549c8948f32.txt b/...15abff5ab29c23e1539327928ef0c1810426f.txt → ...01aa81c5ec76b5ff2dc3f47537549c8948f32.txt
@@ -1,3 +1,10 @@
+GTN_GTN:1716543878
+
+A	assets/css/images/marker-shadow.png
+GTN_GTN:1716542558
+
+R097	metadata/git-mod-de2a583e5852b748451aa01919758428c3dd43d5.txt	metadata/git-mod-5df15abff5ab29c23e1539327928ef0c1810426f.txt
+R098	metadata/git-pub-de2a583e5852b748451aa01919758428c3dd43d5.txt	metadata/git-pub-5df15abff5ab29c23e1539327928ef0c1810426f.txt
 GTN_GTN:1716473084
 
 A	_includes/calendar-buttons.html

diff --git a/metadata/shortlinks.yaml b/metadata/shortlinks.yaml
@@ -1631,6 +1631,10 @@ id:
   F00398: "/faqs/gtn/gtn_example_histories.html"
   N00078: "/news/2024/05/13/fair.html"
   N00079: "/news/2024/05/15/galaxy-europe-freiburg-job.html"
+  F00399: "/faqs/gtn/gtn_event_create.html"
+  N00080: "/news/2024/05/22/introducing-gtn-event-pages.html"
+  E00002: "/events/2023-04-17-gat-gent.html"
+  E00003: "/events/2024-04-01-example-event-external.html"
 misc:
   ansible-galaxy: "/topics/admin/tutorials/ansible-galaxy/tutorial.html"
   stats: "/stats.html"
diff --git a/topics/assembly/images/vgp_assembly/meryl_collections.png b/topics/assembly/images/vgp_assembly/meryl_collections.png
diff --git a/topics/assembly/images/vgp_assembly/purge_dups.png b/topics/assembly/images/vgp_assembly/purge_dups.png