This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 3460e1f7 authored by Michael Breu's avatar Michael Breu :speech_balloon:
Browse files

Merge branch '118-implement-collections' into thumbs_up 

Conflicts:
	.yo-rc.json
	package-lock.json
	src/main/resources/config/liquibase/master.xml
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
	src/main/webapp/app/search/search.component.ts
	src/main/webapp/i18n/de/global.json
parents 31e787f2 68c2aea6
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 33096 additions and 1657 deletions
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