Merge branch 'dev' into refactor

Conflicts: check_setup.php index.php
2014-07-23 13:42:30 +02:00
parent a818ff2000 ebd6bf6007
commit 505a74ad1d
17 changed files with 846 additions and 347 deletions
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@ -1,6 +1,7 @@
 {% extends "layout.twig" %}
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
 {% block content %}
+				{% include '_highlight.twig' %}
        {% include '_pocheit-form.twig' %}
        <div id="article_toolbar">
            <ul>