Merge branch 'master' into devel

Browse Source

Conflicts:
	includes/defaults.inc.php

...

This commit is contained in:

Paul Gear

2013-11-19 21:31:23 +10:00

parent afd00f8f3c 50a010fdad

commit 0a51167fe6

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