Skip to content
Snippets Groups Projects
Commit cd2fdf0e authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'develop' into 'spotit_multi_org' 

# Conflicts:
#   VIPSWeb/static/js/frontpage.js
parents 0c712538 044b574f
No related branches found
No related tags found
1 merge request!3Spotit multi org
Hide whitespace changes
Inline Side-by-side
Showing
with 302 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment