Merge branch 'master' of svs.ankaa.uberspace.de:sterzy/sterzycom

This commit is contained in:
Shannon Sterz 2018-01-10 11:46:15 +01:00
commit fb60282d82
5 changed files with 8 additions and 4 deletions

1
.gitignore vendored
View file

@ -10,4 +10,5 @@ content
thumbs
assets/avatars
wiki
piwik

View file

@ -5,8 +5,11 @@
# enable awesome urls. i.e.:
# http://yourdomain.com/about-us/team
RewriteEngine on
RewriteCond %{HTTP_HOST} !^sterzy\.com$
RewriteRule (.*) https://sterzy.com/$1 [L,R=301]
RewriteCond %{HTTPS} !=on
RewriteCond %{HTTPS} !=on
# redirect all trafic to https
RewriteCond %{ENV:HTTPS} !=on

2
kirby

@ -1 +1 @@
Subproject commit c490d6564a5bc74ddb78afa02ceecd2998513aa7
Subproject commit a2678c41c7f57ef176651e257840861d6c21b653

2
panel

@ -1 +1 @@
Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd
Subproject commit f3010a2676874464016f47a0eec70009bae1f0a5

View file

@ -32,7 +32,7 @@
<header class="header" role="banner" id="header" >
<div class="shader">
<a href="<?php echo url() ?>">
<a href="<?php echo url() ?>" aria-label="Logo - return to main page">
<div id="holders">
<div class="dots"></div>
<div class="pulses"></div>