Commit 68d2b7a3 authored by chrissi^'s avatar chrissi^

flamingo: Move back to master and fix fallout

Signed-off-by: chrissi^'s avatarChris Fiege <chris@tinyhost.de>
parent 6bd2f4ea
Pipeline #1312 passed with stage
in 18 seconds
git+git://github.com/pengutronix/flamingo@a4684c87d0d4859988a0eca5958b09671582d01b#egg=flamingo
git+git://github.com/pengutronix/flamingo@master#egg=flamingo
beautifulsoup4==4.5.3
Pillow==4.3.0
ipython==6
......
git+git://github.com/pengutronix/flamingo@a4684c87d0d4859988a0eca5958b09671582d01b#egg=flamingo[full]
git+git://github.com/pengutronix/flamingo@master#egg=flamingo[full]
beautifulsoup4==4.5.3
Pillow==4.3.0
ipython==6
......
......@@ -6,7 +6,7 @@ output: index.html
<!-- Heading Row -->
<div class="row">
<div class="col-md-8">
<img class="img-responsive img-rounded" src="/assets/images/Logo_Freifunk_Braunschweig.svg" alt="">
<img class="img-responsive img-rounded" src="Logo_Freifunk_Braunschweig.svg" alt="">
</div>
<div class="col-md-4">
<h1>Für ein freies Netz</h1>
......@@ -86,7 +86,7 @@ output: index.html
</div>
<div class="panel-body">
<div class="licensed-image">
<img class="img-responsive center-block" alt="Bootstrap template" src="/assets/images/stratum0.jpg">
<img class="img-responsive center-block" alt="Bootstrap template" src="index_stratum0.jpg">
<div class="license">
<p class="license-inner">CC-BY-SA 3.0 rohieb</p>
</div>
......@@ -106,7 +106,7 @@ output: index.html
</div>
<div class="panel-body">
<div class="licensed-image">
<img class="img-responsive center-block" src="/assets/images/ffbs_router.png">
<img class="img-responsive center-block" src="index_ffbs_router.png">
<div class="license">
<p class="license-inner">CC-BY-SA 3.0 rohieb</p>
</div>
......@@ -124,7 +124,7 @@ output: index.html
</div>
<div class="panel-body">
<div class="licensed-image">
<img class="img-responsive center-block" alt="Bootstrap template" src="/assets/images/ffbs_anschliessen.png">
<img class="img-responsive center-block" alt="Bootstrap template" src="index_ffbs_anschliessen.png">
<div class="license">
<p class="license-inner">CC-BY-SA 3.0 rohieb</p>
</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