Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fltrail
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e4a8603a

Commit e4a8603a authored 5 years ago by wiepke

Downloads
- Patches
- Plain Diff

fix merge

parent 8aaab0a7

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/annotation/view/AnnotationService.java 0 additions, 31 deletions

...potsdam/gf/modules/annotation/view/AnnotationService.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/contributionFeedback/view/ContributionFeedbackView.java 1 addition, 9 deletions

...s/contributionFeedback/view/ContributionFeedbackView.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java 2 additions, 6 deletions

...in/java/unipotsdam/gf/process/DossierCreationProcess.java
gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java 19 additions, 5 deletions

...en/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
gemeinsamforschen/src/main/webapp/project/js/tasks.js 10 additions, 1 deletion

gemeinsamforschen/src/main/webapp/project/js/tasks.js

with 32 additions and 52 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 sign in to comment