Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VIPSCore
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

58cdfc97

Commit 58cdfc97 authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop

See merge request !2

parents ed437cf9 c42c2298

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

nb-configuration.xml 0 additions, 1 deletion

nb-configuration.xml
pom.xml 128 additions, 7 deletions

pom.xml
src/main/java/no/nibio/vips/core/VIPSCoreApplication.java 0 additions, 1 deletion

src/main/java/no/nibio/vips/core/VIPSCoreApplication.java
src/main/java/no/nibio/vips/core/config/JacksonConfig.java 3 additions, 0 deletions

src/main/java/no/nibio/vips/core/config/JacksonConfig.java
src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java 2 additions, 0 deletions

...in/java/no/nibio/vips/core/service/ModelResourceImpl.java
src/main/webapp/WEB-INF/jboss-deployment-structure.xml 4 additions, 0 deletions

src/main/webapp/WEB-INF/jboss-deployment-structure.xml

with 137 additions and 9 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