Commit graph

4 commits

Author SHA1 Message Date
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
Alexandr Danilov a6523cfe86 fix #1281 2015-08-08 00:16:14 +03:00
Alexandr Danilov c54ea989a3 fix #1281 (notifications when we star articles are buggy)
All notification corrected
2015-08-08 00:08:29 +03:00
Alexandr Danilov 53e121881b Added Material theme 2015-08-04 17:18:15 +03:00