Merge GitLab integration

# Conflicts:
#	CHANGELOG.md
#	Dockerfile
#	README.md
#	psu
This commit is contained in:
Tortue Torche
2019-12-04 15:23:08 +01:00
committed by Tortue Torche
parent edde3e86c7
commit aca3e69669
27 changed files with 1831 additions and 111 deletions

File diff suppressed because one or more lines are too long