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
@@ -10,7 +10,7 @@ declare module "angular-translate" {
export = ngt;
}
declare module angular.translate {
declare namespace angular.translate {
interface ITranslationTable {
[key: string]: any;
@@ -110,7 +110,7 @@ declare module angular.translate {
}
}
declare module angular {
declare namespace angular {
interface IFilterService {
(name:'translate'): {
(translationId: string, interpolateParams?: any, interpolation?: string): string;