Merge commit 'upstream/master~480' into types-2.0

angular-breadcrumb/index.d.ts

@@ -14,7 +14,7 @@ declare namespace angular.ui {
             /**
              * Override the parent state (only for the breadcrumb)
              **/
-            parent?: string;
+            parent?: string|Function;
             /**
             * When defined to true, the state is never included in the chain of states and never appears in the breadcrumb
             **/
@@ -76,4 +76,4 @@ declare namespace ncy {
         **/
         getLastStep(): angular.ui.IState;
     }
-}
+}