Commit Graph

2 Commits

Author SHA1 Message Date
7379bf60b5 Merge remote-tracking branch 'upstream/master' into code-upgrade
Conflicts:
	htdocs/coordinates.php
	htdocs/lib2/logic/coordinate.class.php
2015-01-22 01:11:18 +01:00
8f779cb357 Renamed root namespace to "OpencachingDE".
Signed-off-by: Markus Birth <mbirth@gmail.com>
2014-01-12 05:37:13 +01:00