Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Juan Ferrer Toribio 2017-06-02 15:23:30 +02:00
commit 02d0e167a0
1 changed files with 1 additions and 1 deletions

View File

@ -2,8 +2,8 @@ var gulp = require('gulp');
var gutil = require('gulp-util'); var gutil = require('gulp-util');
var wrap = require('gulp-wrap'); var wrap = require('gulp-wrap');
var concat = require('gulp-concat'); var concat = require('gulp-concat');
var extend = require('gulp-extend');
var merge = require('merge-stream'); var merge = require('merge-stream');
var extend = require('gulp-extend');
var del = require('del'); var del = require('del');
var fs = require('fs'); var fs = require('fs');
var webpack = require('webpack'); var webpack = require('webpack');