Giuseppe Digilio ada577c2be Merge remote-tracking branch 'remotes/origin/master' into notifications ...

# Conflicts:
#	src/app/app.component.ts
#	src/app/core/core.module.ts

2018-05-07 16:10:17 +02:00

..

cache-config.interface.ts

recursive merge of config

2017-09-26 19:13:32 -05:00

config.interface.ts

recursive merge of config

2017-09-26 19:13:32 -05:00

global-config.interface.ts

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

2018-05-07 16:10:17 +02:00

notifications-config.interfaces.ts

Adjusted CSS and added default notification options in the environment config files

2018-05-07 15:49:03 +02:00

server-config.interface.ts

recursive merge of config

2017-09-26 19:13:32 -05:00

universal-config.interface.ts

recursive merge of config

2017-09-26 19:13:32 -05:00