Commit Graph

4 Commits

Author SHA1 Message Date
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
a6523cfe86 fix #1281 2015-08-08 00:16:14 +03:00
3f3fbef11f Add tags list display 2015-08-07 18:17:23 +02:00
495aecfe74 Cleanup & simplify theme 2015-03-01 10:49:17 +01:00