Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [ticket/11060] Backport ca4cee86af to olympus.

Conflicts:
	.travis.yml

...

This commit is contained in:

Nils Adermann

2012-08-26 15:20:04 +02:00

parent bfdba90a34 a3d87a1443

commit 90d26bb946

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