Merge branch 'stable' of https://github.com/OpencachingDeutschland/oc-server3 into stable

Browse Source

Conflicts:
	htdocs/util/mysql_root/sql_root.inc.php

...

This commit is contained in:

Oliver

2012-12-09 16:30:57 +01:00

parent 6991e9ecd8 81f366c1a9

commit a01d126d56

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