Merge branch 'develop' of github.com:portainer/portainer into develop

pull/2755/head
Anthony Lapenna 2019-03-04 13:48:01 +13:00
commit e2a17480af
1 changed files with 1 additions and 1 deletions

View File

@ -85,7 +85,7 @@ module.exports = function(grunt) {
grunt.initConfig({ grunt.initConfig({
root: 'dist', root: 'dist',
distdir: 'dist/public', distdir: 'dist/public',
shippedDockerVersion: '18.09.0', shippedDockerVersion: '18.09.3',
shippedDockerVersionWindows: '17.09.0-ce', shippedDockerVersionWindows: '17.09.0-ce',
pkg: grunt.file.readJSON('package.json'), pkg: grunt.file.readJSON('package.json'),
config: gruntfile_cfg.config, config: gruntfile_cfg.config,