Merge branch 'release/v2.0'

ayanonly1 · ayanonly1 · commit c56e46439e3f · 2015-03-24T19:58:26.000+05:30
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -36,5 +36,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadTasks('./grunt-tasks');
-    grunt.registerTask('default', ['makeDemos:demos', 'uglify', 'copy']);
+    //grunt.registerTask('default', ['makeDemos:demos', 'uglify', 'copy']); // For gh-pages branch only
+    grunt.registerTask('default', ['uglify', 'copy']); // For other branches
 };
diff --git a/dist/angular-fusioncharts.min.js b/dist/angular-fusioncharts.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-fusioncharts",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Angular plugin for FusionCharts",
   "main": "src/angular-fusioncharts",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-fusioncharts",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "2.0.0",`
`4`	`4`	`"description": "Angular plugin for FusionCharts",`
`5`	`5`	`"main": "src/angular-fusioncharts",`
`6`	`6`	`"repository": {`