Files
oc-server3/htdocs/lib/OpencachingDE/Conversions
Markus Birth 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
..