Merge branch 'release/1.0.4.1'

Conflicts:
	css/Ribs.min.css
This commit is contained in:
Nick Pack 2013-07-14 22:37:04 +01:00
commit c6a5918532
2 changed files with 6 additions and 2 deletions

View File

@ -1,5 +1,9 @@
{
"unique-headings": false,
"box-model": false,
"font-sizes": false
"font-sizes": false,
"compatible-vendor-prefixes": false,
"unqualified-attributes": false,
"outline-none": false,
"box-sizing": false
}

2
css/Ribs.min.css vendored

File diff suppressed because one or more lines are too long