Merge branch 'master' into searchbar-fix

# 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

View File

@ -1,4 +1,4 @@
import * as domUtil from 'ionic/util/dom'
import * as domUtil from './util/dom'
export const dom = domUtil
export * from 'ionic/util/util'
export * from './util/util'