tree 923c5879a272777095fcc08a5c2da9e7013b58d8
parent 77446989879037b2e03053d8ca2518c2727e5450
parent 3fc14a3161cc0445c54623a460971cc1f1d13bdc
author mgardyan <martin.gardyan@pta.de> 1505825605 +0200
committer mgardyan <martin.gardyan@pta.de> 1505825605 +0200

Merge branch 'DEVELOP_FE' of ssh://git.eclipse.org:29418/elogbook/elogbookFE into DEVELOP_FE

# Conflicts:
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/dialogs/entry/entry.component.spec.ts
#	src/app/lists/abstract-list/abstract-list.component.ts
#	src/app/pages/overview/overview.component.ts