Merge branch 'expandRow' of github.com:droyuki/react-bootstrap-table into expandRow

Author: droyuki

package.json

@@ -1,80 +1,80 @@
 {
-  "name": "react-bootstrap-table",
-  "version": "2.5.8",
-  "description": "It's a react table for bootstrap",
-  "main": "./lib/index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AllenFang/react-bootstrap-table.git"
-  },
-  "scripts": {
-    "lint": "eslint src",
-    "start": "gulp example-server"
-  },
-  "keywords": [
-    "react",
-    "bootstrap",
-    "table",
-    "grid",
-    "react-component"
-  ],
-  "files": [
-    "README.md",
-    "lib/",
-    "dist/",
-    "css/"
-  ],
-  "tags": [
-    "react"
-  ],
-  "author": "AllenFang",
-  "license": "MIT",
-  "devDependencies": {
-    "babel": "^5.8.29",
-    "babel-core": "^5.8.30",
-    "babel-eslint": "^4.1.1",
-    "babel-loader": "^5.3.3",
-    "babelify": "^6.4.0",
-    "bootstrap": "3.3.5",
-    "browserify": "^11.2.0",
-    "css-loader": "^0.21.0",
-    "del": "^2.2.0",
-    "eslint": "1.7.3",
-    "eslint-config-airbnb": "0.1.0",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-react": "3.6.3",
-    "gulp": "^3.9.1",
-    "gulp-babel": "^5.3.0",
-    "gulp-concat-css": "^2.2.0",
-    "gulp-cssmin": "^0.1.7",
-    "gulp-shell": "^0.5.2",
-    "history": "^1.17.0",
-    "jquery": "^2.1.4",
-    "jsx-loader": "^0.13.2",
-    "react": "^0.14.3 || ^15.0.0",
-    "react-bootstrap": "^0.29.5",
-    "react-dom": "^0.14.3 || ^15.0.0",
-    "react-hot-loader": "^1.3.0",
-    "react-router": "^1.0.2",
-    "style-loader": "^0.13.0",
-    "toastr": "^2.1.2",
-    "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.0.0",
-    "webpack": "^1.12.4",
-    "webpack-dev-server": "^1.12.1"
-  },
-  "dependencies": {
+	"name": "react-bootstrap-table",
+	"version": "2.5.8",
+	"description": "It's a react table for bootstrap",
+	"main": "./lib/index.js",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/AllenFang/react-bootstrap-table.git"
+	},
+	"scripts": {
+		"lint": "eslint src",
+		"start": "gulp example-server"
+	},
+	"keywords": [
+		"react",
+		"bootstrap",
+		"table",
+		"grid",
+		"react-component"
+	],
+	"files": [
+		"README.md",
+		"lib/",
+		"dist/",
+		"css/"
+	],
+	"tags": [
+		"react"
+	],
+	"author": "AllenFang",
+	"license": "MIT",
+	"devDependencies": {
+		"babel": "^5.8.29",
+		"babel-core": "^5.8.30",
+		"babel-eslint": "^4.1.1",
+		"babel-loader": "^5.3.3",
+		"babelify": "^6.4.0",
+		"bootstrap": "3.3.5",
+		"browserify": "^11.2.0",
+		"css-loader": "^0.21.0",
+		"del": "^2.2.0",
+		"eslint": "1.7.3",
+		"eslint-config-airbnb": "0.1.0",
+		"eslint-loader": "^1.3.0",
+		"eslint-plugin-react": "3.6.3",
+		"gulp": "^3.9.1",
+		"gulp-babel": "^5.3.0",
+		"gulp-concat-css": "^2.2.0",
+		"gulp-cssmin": "^0.1.7",
+		"gulp-shell": "^0.5.2",
+		"jquery": "^2.1.4",
+		"jsx-loader": "^0.13.2",
+		"react": "^0.14.3 || ^15.0.0",
+		"react-bootstrap": "^0.29.5",
+		"react-dom": "^0.14.3 || ^15.0.0",
+		"react-hot-loader": "^1.3.0",
+		"react-router": "^1.0.2",
+		"style-loader": "^0.13.0",
+		"toastr": "^2.1.2",
+		"vinyl-source-stream": "^1.1.0",
+		"watchify": "^3.0.0",
+		"webpack": "^1.12.4",
+		"webpack-dev-server": "^1.12.1"
+	},
+	"dependencies": {
     "underscore": "1.8.3",
-    "classnames": "^2.1.2",
-    "react-toastr": "^2.8.0"
-  },
-  "peerDependencies": {
-    "react": "^0.14.3 || ^15.0.0"
-  },
-  "jest": {
-    "scriptPreprocessor": "<rootDir>/preprocessor.js",
-    "unmockedModulePathPatterns": [
-      "<rootDir>/node_modules/react"
-    ]
-  }
+		"history": "^1.7.0",
+		"classnames": "^2.1.2",
+		"react-toastr": "^2.8.0"
+	},
+	"peerDependencies": {
+		"react": "^0.14.3 || ^15.0.0"
+	},
+	"jest": {
+		"scriptPreprocessor": "<rootDir>/preprocessor.js",
+		"unmockedModulePathPatterns": [
+			"<rootDir>/node_modules/react"
+		]
+	}
 }