Jeremy Benoist b878be4cc9 Merge remote-tracking branch 'origin/master' into 2.4 ... # Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js		2018-11-25 09:58:18 +01:00
..
fonts	Removing web/bundles/wallabagcore and adding prod assets in web/wallassets	2017-10-24 00:19:00 +02:00
img	Removing web/bundles/wallabagcore and adding prod assets in web/wallassets	2017-10-24 00:19:00 +02:00
themes/_global/img	Merge pull request #3606 from mritzmann/master	2018-10-15 08:30:26 +00:00
baggy.css	Update assets	2018-09-25 10:21:21 +02:00
baggy.css.map	Removing web/bundles/wallabagcore and adding prod assets in web/wallassets	2017-10-24 00:19:00 +02:00
baggy.js	Card no preview replaced by wallabag logo	2018-11-21 18:51:44 +01:00
manifest.json	Card no preview replaced by wallabag logo	2018-11-21 18:51:44 +01:00
material.css	Merge remote-tracking branch 'origin/master' into 2.4	2018-11-25 09:58:18 +01:00
material.css.map	Removing web/bundles/wallabagcore and adding prod assets in web/wallassets	2017-10-24 00:19:00 +02:00
material.js	Card no preview replaced by wallabag logo	2018-11-21 18:51:44 +01:00
public.css	Fix mobile viewport on big iframe and video elements	2018-06-28 15:22:51 +02:00
public.css.map	Removing web/bundles/wallabagcore and adding prod assets in web/wallassets	2017-10-24 00:19:00 +02:00
public.js	Card no preview replaced by wallabag logo	2018-11-21 18:51:44 +01:00