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

Merge branch 'security-stable-1.596' into security-stable-1.609 

Conflicts:
	test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
parents 0d3f5788 58c6f18b
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