Skip to content
Snippets Groups Projects
Commit f9108b31 authored by Julian Dehne's avatar Julian Dehne
Browse files

Merge remote-tracking branch 'gitup/development_master' into development_master

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
parents 8e2ff651 d1168c34
No related branches found
No related tags found
No related merge requests found
Showing
with 378 additions and 193 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