Merge branch 'source' into use-bulma

source/_layouts/default.html.twig

@@ -13,7 +13,7 @@
 
         {% include 'og' with { og: page.meta.og } %}
 
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
         {% block stylesheets '' %}
 
         {% for size in site.apple_touch_icon_sizes %}

source/_talks/deploying-php-with-fabric.md

@@ -19,6 +19,9 @@ meta:
             width: 1280
             height: 800
             type: image/png
+slug: deploying-php-fabric
+redirect:
+    - talks/deploying-php-applications-with-fabric/
 ---
 You’ve built your application, and now you just need to deploy it. There are various ways that this could be done – from (S)FTP, to SCP and rsync, to running commands like “git pull” and “composer install” directly on the server (not recommended).