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

Browse Source

Conflicts:
	common.gradle

experimental

Daniel Johansson 10 years ago

parent 8f77dca931 89f10eca58

commit 352a532730

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

Show Stats Download Patch File Download Diff File

Diff Content Not Available