merge

CyrilLin · Feb 26, 2015 · fe3875c · fe3875c
2 parents cb23fa1 + 880bf47
commit fe3875c
Show file tree

Hide file tree

Showing 7 changed files with 468 additions and 458 deletions.
diff --git a/bower.json b/bower.json
@@ -1,12 +1,12 @@
 {
-    "name": "smart-table",
-    "version": "1.4.11",
+    "name": "angular-smart-table",
+    "version": "1.4.12",
     "homepage": "https://github.com/lorenzofox3/Smart-Table",
     "authors": [
         "lorenzofox3 <[email protected]>"
     ],
     "description": "table module for angular",
-    "main": "dist/smart-table.min.js",
+    "main": "dist/smart-table.js",
     "keywords": [
         "smart-table",
         "angular",

diff --git a/changeLog.md b/changeLog.md
@@ -104,3 +104,8 @@ function(tableState, tableController){
 * fix #296
 * add possibility to bind a callback when page changes
 
+## version 1.4.12
+
+* don't use pagination class twice
+* build improvement
+