Merge branch 'master' into combine-stylesheets

Browse Source

...

This commit is contained in:

James Panther

2019-11-04 09:19:44 +11:00

parent 1b5d9d3c1a 2ea0eeeb7a

commit 540822456d

7 changed files with 11 additions and 18 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

static/assets/blue.css

+1 -1

File diff suppressed because one or more lines are too long

static/assets/green.css

+1 -1

File diff suppressed because one or more lines are too long

static/assets/pink.css

+1 -1

File diff suppressed because one or more lines are too long

static/assets/red.css

+1 -1

File diff suppressed because one or more lines are too long