Merge pull request #36 from paulcpederson/master

bump to 1.1.2
paulcpederson · Sep 22, 2014 · d4cf5f4 · d4cf5f4
2 parents ba0dd9f + aca85d5
commit d4cf5f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Angular-Dimple Changelog
 
+# v1.1.2
+* add default width (100%)
+* add default height (100%)
+* add default margin (60, 60, 20, 40)
+
 # v1.1.1
 * add time formats and such
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-dimple",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "dist/angular-dimple.js",
   "homepage": "http://esripdx.github.io/angular-dimple/",
   "authors": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-dimple",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Angular.js wrapper for the Dimple charting language",
   "repository": "https://github.com/esripdx/angular-dimple",
   "license": "ISC",