javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 04:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into searchbar-fix

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2015-12-10 17:55:44 -05:00
parent ab4ad905a8
commit ff8169cb0a
84 changed files with 634 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/build/config.js
View File

@ -17,6 +17,7 @@ module.exports = {
'node_modules/angular2/bundles/angular2.dev.js',
'node_modules/angular2/bundles/router.dev.js',
'node_modules/angular2/bundles/http.dev.js',
'node_modules/es6-shim/es6-shim.min.js',
'dist/js/ionic.js',
'scripts/resources/web-animations-js/web-animations.min.js'
],