Merge remote-tracking branch 'origin/master' into 2.4

Browse Source

# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js

...

This commit is contained in:

Jeremy Benoist

2018-11-25 09:58:18 +01:00

parent e673b54f70 bffe65478d

commit b878be4cc9

40 changed files with 802 additions and 136 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

web/wallassets/material.css

File diff suppressed because one or more lines are too long