Merge remote-tracking branch 'upstream/master'

This commit is contained in:
StefanSchoof committed 2014-05-14 21:50:51 +02:00
commit a4bd01026c
222 files changed
+306085 -30156

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ declare module ng.translate {
}
interface ITranslateService {
(key: string, ...params: string[]): string;
(key: string, ...params: string[]): ng.IPromise<string>;
fallbackLanguage(): string;
preferredLanguage(): string;
proposedLanguage(): string;