Skip to content
Commit 17800410 authored by Jesse Glick's avatar Jesse Glick
Browse files

Merge branch 'security' into security-stable-1.580 

Conflicts:
	test/src/test/java/hudson/model/UserTest.java
parents 45c23d33 f58ba6e7
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