Merge with master

master
John Kiernander 2014-02-19 08:00:02 +00:00 committed by johnkiernander
parent 600816303f
commit 51f69dc189
2 changed files with 2 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "dimple", "name": "dimple",
"version": "1.1.3", "version": "1.1.6",
"private": true, "private": true,
"licenses": [ "licenses": [
{ {

View File

@ -4,7 +4,7 @@
// Create the stub object // Create the stub object
var dimple = { var dimple = {
version: "1.1.2", version: "1.1.6",
plot: {}, plot: {},
aggregateMethod: {} aggregateMethod: {}
}; };