chore: update kirby and fix minor issues

2017-09-19 19:00:12 +02:00 · 2017-09-19 19:00:12 +02:00 · bbc47f3822
commit bbc47f3822
parent 386101f211
4 changed files with 7 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,4 +10,5 @@ content
 thumbs
 assets/avatars
 wiki
+piwik

--- a/.htaccess
+++ b/.htaccess
@ -6,7 +6,10 @@
    # http://yourdomain.com/about-us/team
    RewriteEngine on
    
-    RewriteCond %{HTTPS} !=on
+    RewriteCond %{HTTP_HOST} !^sterzy\.com$
+    RewriteRule (.*) https://sterzy.com/$1 [L,R=301]
+
+   RewriteCond %{HTTPS} !=on

    # redirect all trafic to https
    RewriteCond %{ENV:HTTPS} !=on
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c490d6564a5bc74ddb78afa02ceecd2998513aa7
+Subproject commit fb7cc905d7a47dac00ee172516d45204d1bf9965
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd
+Subproject commit 370e9767766c2d9404bcbaf0fd1f7922d9458bd1