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

Merge branch 'development_master' of...

Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into development_master

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskName.java
parents 3c2701bf 6e99d9b3
No related branches found
No related tags found
No related merge requests found
Showing
with 399 additions and 111 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment