Merge remote-tracking branch 'remotes/origin/master' into submission

# Conflicts:
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2019-01-25 10:00:52 +01:00
10 changed files with 273 additions and 8 deletions

View File

@@ -5,6 +5,7 @@ import { UniversalConfig } from './universal-config.interface';
import { INotificationBoardOptions } from './notifications-config.interfaces';
import { SubmissionConfig } from './submission-config.interface';
import { FormConfig } from './form-config.interfaces';
import {LangConfig} from './lang-config.interface';
export interface GlobalConfig extends Config {
ui: ServerConfig;
@@ -18,4 +19,6 @@ export interface GlobalConfig extends Config {
gaTrackingId: string;
logDirectory: string;
debug: boolean;
defaultLanguage: string;
languages: LangConfig[];
}