[#1590] Add JSON import from wallabag v2

2016-01-20 14:37:01 +01:00
parent d481f42b7d
commit 6785f4aa74
12 changed files with 344 additions and 20 deletions
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
+++ b/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
@ -0,0 +1,2 @@
+{% extends "WallabagImportBundle:WallabagV1:index.html.twig" %}
+{% block title %}{% trans %}Import > Wallabag v2{% endtrans %}{% endblock %}