Skip to content
Commit e56ebc62 authored by kzantow's avatar kzantow
Browse files

Merge remote-tracking branch 'primary/2.0' into 2.0 

# Conflicts:
#	core/src/main/resources/jenkins/install/pluginSetupWizard.properties
#	war/src/main/js/pluginSetupWizardGui.js
#	war/src/main/less/pluginSetupWizard.less
parents 8a84cb8e ede925ca
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment