Merge branch 'version-1' into feature/bd-29

Conflicts:
	.gitignore
	README.md
	auth/dktk
	dktk-fed/docker-compose.yml
	landing/index.html
	lib/generate.sh
This commit is contained in:
root
2022-05-04 09:22:39 +02:00
20 changed files with 494 additions and 1319 deletions

13
.gitignore vendored
View File

@ -1,16 +1,7 @@
##Ignore site configuration
.gitmodules
site-config
## Ignore site configuration
config/**/*
!config/**/*.default
docker-compose.override.yml
site.conf
.bash_logout
.bash_profile
.bashrc
.bash_history
.rnd
.pki/*
.viminfo
lading/*
certs/*