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

Merge remote-tracking branch 'upstream/master' into code-upgrade

Browse Source
This commit is contained in:
Markus Birth 2015-01-11 22:07:28 +01:00
commit ec2f4640f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
View File

@ -80,13 +80,13 @@
Vorstandes gemeinsam vertretungsberechtigt.
</p>
<p>
Der gesch&auml;ftsf&uuml;hrende Vorstand besteht aus (Stand 06.06.2013):
Der gesch&auml;ftsf&uuml;hrende Vorstand besteht aus (Stand 26.11.2013):
</p>
<p>
<ul class="indent narrowlist">
<li>Michael Vaahsen, Vorsitzender</li>
<li>Mirco Baumann, 2. Vorsitzender</li>
<li>Maik Bischoff, Kassenwart</li>
<li>Christoph Convent, Kassenwart (kommissarisch)</li>
</ul>
</p>

4
htdocs/templates2/ocstyle/articles/EN/impressum.tpl
View File

@ -62,13 +62,13 @@
</p>
<p>
The managing comittee are (as of July 06, 2013):
The managing comittee are (as of November 26th, 2014):
</p>
<p>
<ul class="indent narrowlist">
<li>Michael Vaahsen, chairman</li>
<li>Mirco Baumann, vice chairman</li>
<li>Maik Bischoff, treasurer</li>
<li>Christoph Convent, treasurer (acting)</li>
</ul>
</p>