Alexandr Danilov 4919584b87 Merge remote-tracking branch 'origin/v2' into v2_fix_material ... # Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig		2015-08-10 12:27:12 +03:00
..
ApiBundle	Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived	2015-07-28 23:23:49 +02:00
CoreBundle	Merge remote-tracking branch 'origin/v2' into v2_fix_material	2015-08-10 12:27:12 +03:00