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

Merge branch 'security' into security-rc 

Conflicts:
	core/src/main/java/hudson/model/Api.java
	test/src/test/java/hudson/model/ApiTest.java
parents 6fe334cc 1887656c
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