Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame committed 2016-03-17 21:06:54 +09:00
commit 7de6c3dd94
1140 files changed
+179704 -179635

No files matched your search

+2 -2
View File
@@ -14,7 +14,7 @@ declare var inject: (...fns: Function[]) => any;
///////////////////////////////////////////////////////////////////////////////
// ngMock module (angular-mocks.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng {
declare namespace ng {
///////////////////////////////////////////////////////////////////////////
// AngularStatic
@@ -59,7 +59,7 @@ declare module ng {
flushNext(expectedDelay?: number): void;
verifyNoPendingTasks(): void;
}
///////////////////////////////////////////////////////////////////////////
// IntervalService
// see https://code.angularjs.org/1.2.26/docs/api/ngMock/service/$interval