Commit 3c72a9ca authored by Varun Srivastava's avatar Varun Srivastava
Browse files

Merge branch '92srva1mst-testing-patch-40401' into 'testing'

Update contact.pug to resolve conflict

See merge request !75
parents 4cfb29e6 6a2249e8
Pipeline #2703 passed with stage
in 14 seconds
...@@ -16,7 +16,7 @@ html(lang="de") ...@@ -16,7 +16,7 @@ html(lang="de")
div(class="row") div(class="row")
div(class="col-md-12 margin_bottom_40") div(class="col-md-12 margin_bottom_40")
img(class="mx-auto" src="/img/Kontakt.jpg" width="100%") img(class="mx-auto" src="/img/Kontakt.jpg" width="100%")
div(class="contact-clean" style="background-color: rgb(234,234,234);") div(class="contact-clean background_eaeaea")
if flash.success if flash.success
div.alert.alert-success.alert-dismissible #{flash.success} div.alert.alert-success.alert-dismissible #{flash.success}
a(class="close", href="#", data-dismiss="alert", aria-label="close") × a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
......
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