Skip to content
Snippets Groups Projects
Commit d970dc3e authored by Kevin Thaller's avatar Kevin Thaller
Browse files

Merge remote-tracking branch 'origin/dennis_local' into grademanager_v1.0-kev-local 

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/de/thdeg/grademanager/model/Student.java
parents c3b64ca1 eff0390d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 197 additions and 45 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