From 07e8590ff037e0b780ccfe7c4287cb66443cef0d Mon Sep 17 00:00:00 2001
From: Liam DeBeasi <liamdebeasi@icloud.com>
Date: Tue, 30 Jul 2019 14:17:58 -0400
Subject: [PATCH] sync with master

---
 core/api.txt                                  | 2 +-
 core/src/components.d.ts                      | 2 +-
 core/src/components/menu-controller/readme.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/api.txt b/core/api.txt
index d875b9baba..222f6da89f 100644
--- a/core/api.txt
+++ b/core/api.txt
@@ -663,7 +663,7 @@ ion-menu-controller,method,isAnimating,isAnimating() => Promise<boolean>
 ion-menu-controller,method,isEnabled,isEnabled(menu?: string | null | undefined) => Promise<boolean>
 ion-menu-controller,method,isOpen,isOpen(menu?: string | null | undefined) => Promise<boolean>
 ion-menu-controller,method,open,open(menu?: string | null | undefined) => Promise<boolean>
-ion-menu-controller,method,registerAnimation,registerAnimation(name: string, animation: AnimationBuilder | ((menu: MenuI) => IonicAnimation)) => Promise<void>
+ion-menu-controller,method,registerAnimation,registerAnimation(name: string, animation: ((menu: MenuI) => IonicAnimation) | AnimationBuilder) => Promise<void>
 ion-menu-controller,method,swipeGesture,swipeGesture(enable: boolean, menu?: string | null | undefined) => Promise<HTMLIonMenuElement | undefined>
 ion-menu-controller,method,toggle,toggle(menu?: string | null | undefined) => Promise<boolean>
 
diff --git a/core/src/components.d.ts b/core/src/components.d.ts
index 192ef71ffd..11ee81fad1 100644
--- a/core/src/components.d.ts
+++ b/core/src/components.d.ts
@@ -1427,7 +1427,7 @@ export namespace Components {
     * @param name The name of the animation to register.
     * @param animation The animation function to register.
     */
-    'registerAnimation': (name: string, animation: AnimationBuilder | ((menu: MenuI) => IonicAnimation)) => Promise<void>;
+    'registerAnimation': (name: string, animation: ((menu: MenuI) => IonicAnimation) | AnimationBuilder) => Promise<void>;
     /**
     * Enable or disable the ability to swipe open the menu.
     * @param enable If `true`, the menu swipe gesture should be enabled.
diff --git a/core/src/components/menu-controller/readme.md b/core/src/components/menu-controller/readme.md
index f51a9fe48a..7887a43e01 100644
--- a/core/src/components/menu-controller/readme.md
+++ b/core/src/components/menu-controller/readme.md
@@ -116,7 +116,7 @@ Type: `Promise<boolean>`
 
 
 
-### `registerAnimation(name: string, animation: AnimationBuilder | ((menu: MenuI) => IonicAnimation)) => Promise<void>`
+### `registerAnimation(name: string, animation: ((menu: MenuI) => IonicAnimation) | AnimationBuilder) => Promise<void>`
 
 Registers a new animation that can be used with any `ion-menu` by
 passing the name of the animation in its `type` property.