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

f18b9737

Commit f18b9737 authored 6 years ago by Axel

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/development_master' into PhaseShifter

parents 0925673a 76d97422

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java 6 additions, 6 deletions

...ipotsdam/gf/modules/journal/model/dao/JournalDAOImpl.java
gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionDAOImpl.java 6 additions, 8 deletions

.../modules/journal/model/dao/ProjectDescriptionDAOImpl.java
gemeinsamforschen/src/scripts/dbschema/journal.sql 4 additions, 4 deletions

gemeinsamforschen/src/scripts/dbschema/journal.sql
gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/JournalDAOImplTest.java 9 additions, 13 deletions

...sdam/gf/modules/journal/model/dao/JournalDAOImplTest.java
gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java 8 additions, 8 deletions

...potsdam/gf/modules/journal/model/dao/LinkDAOImplTest.java
gemeinsamforschen/src/test/java/unipotsdam/gf/modules/journal/model/dao/ProjectDescriptionImplDAOTest.java 14 additions, 24 deletions

...ules/journal/model/dao/ProjectDescriptionImplDAOTest.java

with 47 additions and 63 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