Skip to content
Commit 0cc7d3f5 authored by Oleg Nenashev's avatar Oleg Nenashev
Browse files

Merge branch 'stable-1.625' into security-stable-1.625 

Conflicts:
	test/src/test/java/jenkins/security/ApiTokenPropertyTest.java
parents b70520f1 b66128c3
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