Merge branch 'master' of https://github.com/nature/pa11y-dashboard

Browse Source

Conflicts:
	public/css/main.css

...

This commit is contained in:

perryharlock

2013-09-27 16:15:27 +01:00

parent 984339340d 3104cbfdf9

commit abd9bd4081

6 changed files with 23 additions and 6 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

1

public/css/main.css

File diff suppressed because one or more lines are too long

0

public/less/bootstrap.less → public/less/main.less