Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

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

Snippets Groups Projects

6138824b

Commit 6138824b authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'develop' of gitlab.nibio.no:VIPS/VIPSWeb into develop

# Conflicts:
#	VIPSWeb/static/js/frontpage.js

parents 2c3afe37 9f49853b

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

VIPSWeb/static/js/frontpageMap.js 18 additions, 17 deletions

VIPSWeb/static/js/frontpageMap.js
VIPSWeb/templates/settings.js 1 addition, 1 deletion

VIPSWeb/templates/settings.js
forecasts/models.py 28 additions, 18 deletions

forecasts/models.py

with 47 additions and 36 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