Skip to content
Snippets Groups Projects
Commit 04e8cd55 authored by Daniel Gerhardt's avatar Daniel Gerhardt
Browse files

Merge branch '2.0' into 2.1 

Conflicts:
	pom.xml
parents 2b4d856d 22984ffb
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
CHANGELOG.md
+ 1
− 1
View file @ 04e8cd55
...@@ -61,7 +61,7 @@ Contributions: Colin Appel, Sören Gutzeit, Julian Hochstetter, Jan Kammer, ...@@ -61,7 +61,7 @@ Contributions: Colin Appel, Sören Gutzeit, Julian Hochstetter, Jan Kammer,
Daniel Knapp, Alexander Nadler, Julian Rossback, Karolina Rozanka, Jannik Daniel Knapp, Alexander Nadler, Julian Rossback, Karolina Rozanka, Jannik
Schaaf, Felix Schmidt, Artjom Siebert, Daniel Vogel Schaaf, Felix Schmidt, Artjom Siebert, Daniel Vogel
Testing & Feedback: Kevin Atkins, Kathrin Jäger Testing & Feedback: Kevin Atkins, Kathrin Jäger
Sponsoring: [AG QLS](https://www.thm.de/zqe/qmnetzwerk/agqls), Sponsoring: [AG QLS](https://www.thm.de/site/en/hochschule/service/ag-qls.html),
[HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen), [HMWK](https://wissenschaft.hessen.de/wissenschaft/it-neue-medien/kompetenznetz-e-learning-hessen),
[@LLZ](http://llz.uni-halle.de/) [@LLZ](http://llz.uni-halle.de/)
......
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