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
..
_global
baggy
material	Merge remote-tracking branch 'origin/master' into 2.4	2018-11-25 09:58:18 +01:00