Commit 5b74bded authored by Jasin's avatar Jasin

Merge remote-tracking branch 'origin/development' into development

parents 272ecdd5 1da6728d
......@@ -64,9 +64,9 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1616" />
<option name="x" value="661" />
<option name="y" value="359" />
<option name="width" value="1606" />
<option name="height" value="876" />
</component>
<component name="ProjectView">
......@@ -74,6 +74,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -107,7 +108,6 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......
......@@ -70,7 +70,7 @@
<div class="card-body">
<p>Es wurdnen </p>
<h4><span id="mainTimeContent"></span> Minuten</h4>
<p>Verspung an <b>1245 Haltestellen </b>aufgezeichnet.</p>
<p>Verspätung an <b>1245 Haltestellen </b>aufgezeichnet.</p>
<p><small>Aufzeichnung seit: 12:15 Montag, 01. April 2019 (MEZ)</small></p>
<a href="#method" class="btn btn-primary js-scroll-trigger">Methodik</a>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment