Alexandr Danilov 0e654f6273 Merge remote-tracking branch 'origin/v2' into v2_fix_material ...

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

2015-08-10 15:25:23 +03:00

..

_global/public

Cleanup & simplify theme

2015-03-01 10:49:17 +01:00

baggy

Adds pagerfanta paginator everywhere, modifies article routing. Change API for is_starred and is_archived

2015-07-28 23:23:49 +02:00

material

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

2015-08-10 15:25:23 +03:00