1
0

Merge branch 'master' into improve-i18n-files

This commit is contained in:
Art Lowel
2019-09-12 17:13:43 +02:00
216 changed files with 5330 additions and 839 deletions

View File

@@ -13,8 +13,8 @@ import { DSpaceServerTransferStateModule } from '../transfer-state/dspace-server
import { DSpaceTransferState } from '../transfer-state/dspace-transfer-state.service';
import { TranslateJson5UniversalLoader } from '../../ngx-translate-loaders/translate-json5-universal.loader';
import { CookieService } from '../../app/shared/services/cookie.service';
import { ServerCookieService } from '../../app/shared/services/server-cookie.service';
import { CookieService } from '../../app/core/services/cookie.service';
import { ServerCookieService } from '../../app/core/services/server-cookie.service';
import { AuthService } from '../../app/core/auth/auth.service';
import { ServerAuthService } from '../../app/core/auth/server-auth.service';