Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
FCOO
ifm-maps
Repository
ifm-maps
package.json
Find file
Blame
History
Permalink
Merge branch 'release/3.1.1'
· 77e8fa1d
NielsHolt
authored
Oct 14, 2016
# Conflicts: # bower.json # package.json
77e8fa1d
Analyzing file…