Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

c4371205

Commit c4371205 authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'spotit_multi_org' into 'develop'

Spotit multi org

See merge request !16

parents c10f20f9 66ca3e74

Branches

Tags

2 merge requests!17Develop,!16Spotit multi org

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/nibio/vips/logic/controller/session/ForecastBean.java 35 additions, 5 deletions

.../no/nibio/vips/logic/controller/session/ForecastBean.java
src/main/java/no/nibio/vips/logic/entity/ForecastConfiguration.java 3 additions, 1 deletion

...ava/no/nibio/vips/logic/entity/ForecastConfiguration.java
src/main/java/no/nibio/vips/logic/service/LogicService.java 59 additions, 1 deletion

src/main/java/no/nibio/vips/logic/service/LogicService.java

with 97 additions and 7 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