Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

3e486d9b

Commit 3e486d9b authored 4 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 27e08413 71bd35ca

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
pom.xml 8 additions, 2 deletions

pom.xml
src/main/java/no/nibio/vips/coremanager/config/JacksonConfig.java 9 additions, 0 deletions

.../java/no/nibio/vips/coremanager/config/JacksonConfig.java
src/main/java/no/nibio/vips/coremanager/service/ManagerResourceImpl.java 19 additions, 0 deletions

...o/nibio/vips/coremanager/service/ManagerResourceImpl.java

with 37 additions and 2 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