Merge branch 'develop' into feature/autoresize

Browse Source

Conflicts:
	VERSION

...

This commit is contained in:

Manuel Friedli 2014-08-26 15:54:00 +02:00

parent 28108572c4 c885b15fcb

commit 0bd5c3bc16

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