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

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

Merge branch 'development' into 'achievements' 

# Conflicts:
#   src/main/resources/.h2.server.properties
#   src/main/webapp/app/exercise/service/exercise.service.ts
parents 60c48e24 111a63e6
2 merge requests!188Merging Peer Reviewing et. al to Master,!164211 peer reviewing functionality
Hide whitespace changes
Inline Side-by-side
Showing
with 230 additions and 128 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