Merge remote-tracking branch 'origin/master' into 101-admin-panel-should-use-api (cbb8c5f9) · Commits · minerva / core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

cbb8c5f9

Commit cbb8c5f9 authored 7 years ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into 101-admin-panel-should-use-api

parents 565515c0 2d519068

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/ElementAnnotator.java 13 additions, 12 deletions

...ewer/annotation/services/annotators/ElementAnnotator.java
annotation/src/main/java/lcsb/mapviewer/annotation/services/annotators/EnsemblAnnotator.java 1 addition, 1 deletion

...ewer/annotation/services/annotators/EnsemblAnnotator.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/DrugbankHTMLParserTest.java 2 additions, 3 deletions

...mapviewer/annotation/services/DrugbankHTMLParserTest.java
annotation/src/test/java/lcsb/mapviewer/annotation/services/annotators/ElementAnnotatorTest.java 8 additions, 0 deletions

.../annotation/services/annotators/ElementAnnotatorTest.java

with 24 additions and 16 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