Merge remote-tracking branch 'origin/v2' into v2_fix_material

# Conflicts:
#	src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig

1 files changed, 10 insertions, 0 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php
index 07931f58..09be1b74 100644
--- a/src/Wallabag/CoreBundle/Controller/StaticController.php
+++ b/src/Wallabag/CoreBundle/Controller/StaticController.php
@@ -8,6 +8,16 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 class StaticController extends Controller
 {
     /**
+     * @Route("/howto", name="howto")
+     */
+     public function howtoAction()
+     {
+         return $this->render(
+             'WallabagCoreBundle:Static:howto.html.twig',
+             array()
+         );
+     }
+    /**
      * @Route("/about", name="about")
      */
     public function aboutAction()