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

Browse Source

Conflicts:
	common.gradle

...

This commit is contained in:

Daniel Johansson 2015-08-26 22:34:53 +01:00

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 Expand all files Collapse all files

Diff Content Not Available