Merge remote-tracking branch 'upstream/2.0' into 2.0

This commit is contained in:
Szymon Stasik
2016-02-23 15:02:13 +01:00
113 changed files with 156 additions and 136 deletions

View File

@@ -1,4 +1,4 @@
import * as util from '../../../ionic/util';
import * as util from 'ionic-angular/util';
export function run() {
describe('extend', function() {