Merge pull request ColorlibHQ#156 from christianesperar/master

Package release update
chestart · May 19, 2016 · c15ee30 · c15ee30
2 parents 9a7aca6 + a342d61
commit c15ee30
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 nbproject
+npm-debug.log
diff --git a/bower.json b/bower.json
@@ -1,9 +1,10 @@
 {
   "name": "gentelella",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "homepage": "https://colorlib.com/polygon/gentelella/index.html",
   "authors": [
-    "Aigars Silkalns"
+    "Aigars Silkalns",
+    "Christian Esperar"
   ],
   "description": "Gentellela Admin is a free to use Bootstrap admin template",
   "keywords": [

diff --git a/changelog.md b/changelog.md
@@ -13,3 +13,10 @@ Earlier there were no changelog at all and we have introduced one now and we wil
 
 * Add multilevel menu
 * Mobile comptibility enhancement
+
+### 1.2.0 - 19.05.2016
+
+* Fix menu not become active if url contains parameters
+* Fix form upload form not adjust on large number of files
+* Remove invalid css
+* Add fixed sidebar functionalities
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gentelella",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Gentellela Admin is a free to use Bootstrap admin template",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,6 +21,9 @@
     "responsive"
   ],
   "author": "Aigars Silkalns",
+  "contributors": [
+    "Christian Esperar"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/puikinsh/gentelella/issues"