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

89aa2449

Commit 89aa2449 authored 6 years ago by G0tti

Downloads
- Patches
- Plain Diff

Merge branch 'development_master' of C:\Users\Christian\Desktop\FInalGit\fltrail with conflicts.

parent f7e06075

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/Assessment.java 20 additions, 0 deletions

...ipotsdam/gf/modules/assessment/controller/Assessment.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java 53 additions, 0 deletions

.../modules/assessment/controller/service/FBAssessement.java

with 73 additions and 0 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