Merge branch '1.1.x'

Browse Source

Conflicts:
	doc/getting_started/plugins.rst

...

This commit is contained in:

Antoine Nguyen

2014-10-08 10:25:01 +02:00

parent 917d4a9600 243ee9c574

commit 2fec26e6b4

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