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

bc758ac7

Commit bc758ac7 authored 6 years ago by Sven Kästle

Downloads
- Plain Diff

Merge branch 'annotation_#47-5' into development_master

parents 13e8164f a748fe26

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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 220 additions and 50 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