Merge remote-tracking branch 'upstream/develop'

Jose Pinto
2 parents fafa77b6a7 b4643e4d32
Showing 1 changed file Show diff stats
gulpfile.js
@@ -53,6 +53,7 @@ gulp.task(&#39;pre-install&#39;, function() {
     pump([
         gulp.src('package.json'),
         replace('ssh://git@debonline.dyndns.org:', 'http://git.focasoftware.com/'),
+        replace('.git', '.git#develop'),
         gulp.dest('')
     ]);
 });
@@ -61,6 +62,7 @@ gulp.task(&#39;post-install&#39;, function() {
     pump([
         gulp.src('package.json'),
         replace('http://git.focasoftware.com/', 'ssh://git@debonline.dyndns.org:'),
+        replace('#develop', ''),
         gulp.dest('')
     ]);
 });
...	...	@@ -53,6 +53,7 @@ gulp.task('pre-install', function() {
53	53	pump([
54	54	gulp.src('package.json'),
55	55	replace('ssh://git@debonline.dyndns.org:', 'http://git.focasoftware.com/'),
	56	+ replace('.git', '.git#develop'),
56	57	gulp.dest('')
57	58	]);
58	59	});
...	...	@@ -61,6 +62,7 @@ gulp.task('post-install', function() {
61	62	pump([
62	63	gulp.src('package.json'),
63	64	replace('http://git.focasoftware.com/', 'ssh://git@debonline.dyndns.org:'),
	65	+ replace('#develop', ''),
64	66	gulp.dest('')
65	67	]);
66	68	});