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
@@ -16,7 +16,7 @@ interface Function {
///////////////////////////////////////////////////////////////////////////////
// ng module (angular.js)
///////////////////////////////////////////////////////////////////////////////
declare module ng {
declare namespace ng {
// All service providers extend this interface
interface IServiceProvider {
@@ -679,7 +679,7 @@ declare module ng {
scope?: any;
link?: Function;
compile?: Function;
controller?: any;
controller?: any;
}
///////////////////////////////////////////////////////////////////////////