Skip to content
Commit 58166dfb authored by Jerome Lacoste's avatar Jerome Lacoste
Browse files

Merge remote branch 'upstream/master' 

Reapplied 329a0201

Conflicts:
	core/src/main/java/hudson/widgets/HistoryWidget.java
parents 9005eb66 85a8dd00
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