Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
peterstadler committed Feb 8, 2019
2 parents 0a6e89e + 681d62e commit ac0f511
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion catalogues/options.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<entry xml:id="version">3.4.2</entry><!-- Versionsnummer der WeGA-WebApp -->
<entry xml:id="ODDversion">3.4.0</entry><!-- Versionsnummer der WeGA-ODD Schemata -->
<entry xml:id="versionNews">A050211</entry>
<entry xml:id="versionDate">2019-02-03</entry>
<entry xml:id="versionDate">2019-02-08</entry>
<entry xml:id="entriesPerPage">10</entry>
</div>
<div xml:id="externalPNDResources">
Expand Down
4 changes: 2 additions & 2 deletions templates/var.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ <h2>XML</h2>
</div>
<div class="row" data-template="app-shared:if-matches" data-template-key="docID" data-template-value="A070002">
<div class="col-md-9 piwik-opt-out">
<h2>Piwik Webanalyse</h2>
<iframe src="//www.weber-gesamtausgabe.de/piwik/index.php?module=CoreAdminHome&amp;action=optOut&amp;language=de"/>
<h2>Matomo Webanalyse</h2>
<iframe src="//matomo.euryanthe.de/index.php?module=CoreAdminHome&amp;action=optOut&amp;language=de"/>
</div>
</div>
</div>
Expand Down

0 comments on commit ac0f511

Please sign in to comment.