Merge branch '1.1.x'

Browse Source

Conflicts:
	pom.xml

...

This commit is contained in:

Dave Syer

2016-09-20 14:16:08 +01:00

parent 54f667f5be ce3621ea1d

commit 6599311bb9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available