Merge branch 'oalmali-master'

AllenFang · Dec 12, 2016 · e194fc4 · e194fc4
2 parents 643c8eb + 1bba1a6
commit e194fc4
Show file tree

Hide file tree

Showing 32 changed files with 6,696 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@ node_modules
 *.idea
 *.iml
 lib/
-npm-debug.log
+npm-debug.log
diff --git a/dist/react-bootstrap-table.js b/dist/react-bootstrap-table.js
diff --git a/dist/react-bootstrap-table.js.map b/dist/react-bootstrap-table.js.map
diff --git a/dist/react-bootstrap-table.min.js b/dist/react-bootstrap-table.min.js