chore: update kirby and fix minor issues

This commit is contained in:
Shannon Sterz 2017-09-19 19:00:12 +02:00
parent 386101f211
commit bbc47f3822
4 changed files with 7 additions and 3 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 fb7cc905d7a47dac00ee172516d45204d1bf9965

2
panel

@ -1 +1 @@
Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd
Subproject commit 370e9767766c2d9404bcbaf0fd1f7922d9458bd1