Merge branch 'master' into markitup-react

This commit is contained in:
Andrey Okonetchnikov
2016-10-03 16:57:48 +02:00
30 changed files with 392 additions and 466 deletions

View File

@ -44,6 +44,7 @@
"css-loader": "^0.23.1",
"enzyme": "^2.4.1",
"eslint": "^3.5.0",
"eslint-plugin-class-property": "^1.0.1",
"eslint-plugin-react": "^5.1.1",
"expect": "^1.20.2",
"exports-loader": "^0.6.3",