Skip to content
Snippets Groups Projects
Commit bec14bb9 authored by Axel's avatar Axel
Browse files

Merge branch 'PeerAssessmentAxel' into pages_overview

# Conflicts:
#	gemeinsamforschen/src/main/webapp/pages/project-student.jsp
parents c4d66579 30ec9de0
No related branches found
No related tags found
No related merge requests found
Showing
with 341 additions and 56 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment