Merge branch 'master' into v0.1.8

# Conflicts: # .gitignore # .npmignore # example/README.md # example/config.xml # example/package-lock.json # example/package.json # example/resources/icon.png.md5 # example/resources/ios/splash/Default-Landscape@~ipadpro.png # example/resources/ios/splash/Default-Portrait@~ipadpro.png # example/resources/splash.png.md5 # example/src/pages/home/home.module.ts # package-lock.json # package.json
hicsail · Sep 27, 2017 · 64dfbc7 · 64dfbc7
2 parents c58b1db + 9e3300e
commit 64dfbc7
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 33 deletions.
diff --git a/typings.json b/typings.json
@@ -7,4 +7,4 @@
   "globalDependencies": {
     "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
   }
-}
+}
diff --git a/typings/globals/angular-protractor/typings.json b/typings/globals/angular-protractor/typings.json
diff --git a/typings/globals/es6-shim/typings.json b/typings/globals/es6-shim/typings.json
diff --git a/typings/globals/jasmine/typings.json b/typings/globals/jasmine/typings.json
diff --git a/typings/globals/selenium-webdriver/typings.json b/typings/globals/selenium-webdriver/typings.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
       "globalDependencies": {
         "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"
       }
-    }
+    }