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

Skip to content
Snippets Groups Projects
Commit 24a9fdea authored by Daniel Crazzolara's avatar Daniel Crazzolara
Browse files

Merge branch 'development' into improvement/adapt-import-to-new-artemis-export 

# Conflicts:
#	src/main/webapp/i18n/de/exercise.json
#	src/main/webapp/i18n/en/exercise.json
parents e5671e8a e3dbf261
Branches
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 161 additions and 1481 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