Commit 0ed3c6dc authored by Robert Palm's avatar Robert Palm
Browse files

Merge branch 'ux-flair' into 'master'

Neuer Flair: 'UX-Workshop'

See merge request !438
parents b91a6c7f ea324266
Pipeline #56739 passed with stages
in 6 minutes and 49 seconds
......@@ -807,7 +807,8 @@
"thm_info": "THM Info",
"thm_public_relations": "THM Öffentlichkeitsarbeit",
"zqe": "ZQE",
"zekoll": "ZekoLL"
"zekoll": "ZekoLL",
"ux_workshop": "UX-Werkstatt"
},
"hearts": {
"amount": {
......@@ -974,6 +975,6 @@
"title": "Timeline",
"title_faves": "Timeline - Favoriten"
},
"_version": "22",
"_version": "23",
"title": "tinyCampus"
}
\ No newline at end of file
}
......@@ -807,7 +807,8 @@
"thm_info": "THM Info",
"thm_public_relations": "THM Public Relations",
"zqe": "ZQE",
"zekoll": "ZekoLL"
"zekoll": "ZekoLL",
"ux_workshop": "UX Workshop"
},
"hearts": {
"amount": {
......@@ -974,6 +975,6 @@
"title": "Timeline",
"title_faves": "Timeline - Favorites"
},
"_version": "22",
"_version": "23",
"title": "tinyCampus"
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment