javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v4

Browse Source 
# Conflicts:
#	src/components/slides/swiper/swiper.ts
This commit is contained in:
Adam Bradley
2017-05-24 10:50:58 -05:00
parent bb2bd921aa 3de6d24a40
commit 3f2a753811
16 changed files with 137 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/gulp/util.ts
View File

@@ -209,8 +209,7 @@ export function runAppScriptsServe(testOrDemoName: string, appEntryPoint: string
'--coreDir', coreDir,
'--sass', sassConfigPath,
'--copy', copyConfigPath,
'--enableLint', 'false',
'--bonjour'
'--enableLint', 'false'
];
if (watchConfigPath) {