Merge branch '2.1'

Browse Source

Conflicts:
	.travis.yml

...

This commit is contained in:

DavidBadura 2015-12-24 10:44:51 +00:00

parent 2e42fbd593 0d00df6710

commit 012356f2d5

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