AdvancedPractices/MediaMigrationGovernance
12
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

resolved conflicts..

Browse source
This commit is contained in:
Marcell Mars 2022-01-07 23:04:51 +01:00
commit 9d5ecffd80
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PUBLISH.trigger.md
View file

@ -10,6 +10,6 @@ Don't forget to click on "Comit Changes" to commit the changes.
``` ```
_ _ _ New changes after this _ _ _ _ _ _ New changes after this _ _ _
marcell. marcell.
adnan. adnan.....
your_name your_name
``` ```

5
content/syllabus/index.md
View file

@ -1,6 +1,7 @@
+++ +++
has_topics = ["governance.md", "media.md", "migration.md"] has_topics = ["media.md", "migration.md", "governance.md"]
title = "Summer School 2022 - Media, Migration, Governance" title = "Summer School 2022 - Solidarity, Refuge, Sanctuary: Critical, aesthetic and technological practices in migration research"
>>>>>>> 1fce54c21fee66a9296ed03216fdad7aea96e052
+++ +++
# Summer School 2023 # Summer School 2023