Skip to content
Commit bc0ae8e0 authored by Kohsuke Kawaguchi's avatar Kohsuke Kawaguchi
Browse files

Merge remote-tracking branch 'origin/rc' into rc 

Conflicts:
	changelog.html
parents f6ad2e61 4535b183
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