From bbc47f3822bc87eeb6fb5b38f3deabc85abe491a Mon Sep 17 00:00:00 2001
From: Stefan Sterz <hi@sterzy.com>
Date: Tue, 19 Sep 2017 19:00:12 +0200
Subject: [PATCH] chore: update kirby and fix minor issues

---
 .gitignore | 1 +
 .htaccess  | 5 ++++-
 kirby      | 2 +-
 panel      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d8b5e7..bab3562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ content
 thumbs
 assets/avatars
 wiki
+piwik
 
diff --git a/.htaccess b/.htaccess
index 2b614c8..22e251e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -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
diff --git a/kirby b/kirby
index c490d65..fb7cc90 160000
--- a/kirby
+++ b/kirby
@@ -1 +1 @@
-Subproject commit c490d6564a5bc74ddb78afa02ceecd2998513aa7
+Subproject commit fb7cc905d7a47dac00ee172516d45204d1bf9965
diff --git a/panel b/panel
index 73db1d7..370e976 160000
--- a/panel
+++ b/panel
@@ -1 +1 @@
-Subproject commit 73db1d731efb50c0edd768a1254228c56d7564dd
+Subproject commit 370e9767766c2d9404bcbaf0fd1f7922d9458bd1