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

4abef401

Commit 4abef401 authored 6 years ago by Sven Kästle

Downloads
- Plain Diff

Merge branch 'annotation_#47-4' into development_master

parents f12cbd4e ed95a790

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

gemeinsamforschen/src/main/webapp/assets/css/annotationStyle.css 5 additions, 2 deletions

...amforschen/src/main/webapp/assets/css/annotationStyle.css
gemeinsamforschen/src/main/webapp/assets/js/annotationScript.js 98 additions, 30 deletions

...samforschen/src/main/webapp/assets/js/annotationScript.js
gemeinsamforschen/src/main/webapp/pages/annotation-document.jsp 36 additions, 2 deletions

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

with 139 additions and 34 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