Merge remote-tracking branch 'origin/sean-polish'

Conflicts:
src/Radial.react.js
src/Setup.react.js
styles/radial.less
This commit is contained in:
Jeffrey Morgan
2015-02-13 10:44:00 -08:00
parent e8f87e1ebe
commit c338678094
24 changed files with 1482 additions and 365 deletions

View File

@@ -16,7 +16,7 @@
"release": "gulp release",
"release:beta": "gulp release --beta",
"preinstall": "./deps",
"lint": "jsxhint src/**/* && jsxhint browser/**/*"
"lint": "jsxhint src && jsxhint browser"
},
"licenses": [
{