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
..
css	Merge remote-tracking branch 'origin/master' into 2.4	2018-11-25 09:58:18 +01:00
js	rebase	2017-05-04 14:56:52 +02:00
index.js	Close add entry and search nav JS action improved	2018-01-12 10:07:46 +01:00