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

750e4863

Commit 750e4863 authored 6 years ago by Julian Dehne

Downloads
- Plain Diff

Merge branch 'development_master' of https://github.com/juliandehne/fltrail into development_master

# Conflicts:
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql

parents b8426e77 020a8162

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java 2 additions, 2 deletions

.../src/main/java/unipotsdam/gf/config/GFDatabaseConfig.java
gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css 2 additions, 2 deletions

...amforschen/src/main/webapp/assets/css/annotationStyle.css
gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js 185 additions, 47 deletions

...samforschen/src/main/webapp/assets/js/annotationScript.js
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp 33 additions, 1 deletion

...samforschen/src/main/webapp/pages/annotation-document.jsp

with 222 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