OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
following
2013-07-25 18:34:17 +02:00
parent 3d730dcf75 f7ead9d060
commit 9a6b9c381e
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/license.txt
+3 -3
View File
@@ -39,9 +39,9 @@ Opencaching Deutschland.
If you are using this source code to establish a geocache listing service If you are using this source code to establish a geocache listing service
or some sort of service which can be compared with it, you agree to or some sort of service which can be compared with it, you agree to
publish your geocaching data via XML Interface the same way and under the same publish your geocaching data via XML Interface and/or OKAPI the same way
(or less restrictive) conditions as opencaching.de does; see and under the same (or less restrictive) conditions as opencaching.de does;
http://www.opencaching.de/doc/xml . see http://www.opencaching.de/doc/xml and http://www.opencaching.de/okapi.
A different license may apply to third party components being used. A different license may apply to third party components being used.
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
+6 -1
View File
@@ -321,7 +321,12 @@
Wortlaut dieser Lizenz befindet sich Wortlaut dieser Lizenz befindet sich
<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/master/doc/license.txt">hier</a>. <a href="https://github.com/OpencachingDeutschland/oc-server3/blob/master/doc/license.txt">hier</a>.
Dabei ist zu beachten, dass einige Bestandteile der Software von Drittanbietern Dabei ist zu beachten, dass einige Bestandteile der Software von Drittanbietern
stammen. Diese Bestandteile unterliegen m&ouml;glicherweise anderen Lizenzen. stammen. Diese Bestandteile können anderen Lizenzen unterliegen.
</p>
<p>
Eine Aufstellung der Softwarebestandteile von Drittanbietern, die derzeit auf www.opencaching.de
verwendet werden, inklusive Lizenzbedingungen und weiterer Angaben gibt es
<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/stable/doc/license.txt">hier</a>.
</p> </p>
<p> <p>
Der Quellcode kann via <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a> Der Quellcode kann via <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a>
htdocs/templates2/ocstyle/articles/EN/impressum.tpl
+5
View File
@@ -279,6 +279,11 @@
Please note that some components of the software originate from third parties. These Please note that some components of the software originate from third parties. These
components may be subject to other licenses. components may be subject to other licenses.
</p> </p>
<p>
For a compilation of third party software components which are currently in use at
www.opencaching.de, including license conditions and other information, see
<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/stable/doc/license.txt">this document</a>.
</p>
<p> <p>
The source code can be obtained from <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a>. The source code can be obtained from <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a>.
</p> </p>