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

1
docs/assets/prism-json.min.js vendored Normal file
View File

@ -0,0 +1 @@
Prism.languages.json={comment:/\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,property:{pattern:/"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,greedy:!0},string:{pattern:/"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,greedy:!0},number:/-?\d+\.?\d*(e[+-]?\d+)?/i,punctuation:/[{}[\],]/,operator:/:/,boolean:/\b(?:true|false)\b/,null:{pattern:/\bnull\b/,alias:"keyword"}};