Merge branch 'master' into 310-test-django-cachalot
Showing
- .gitlab-ci.yml 8 additions, 7 deletions.gitlab-ci.yml
- .gitmodules 0 additions, 20 deletions.gitmodules
- CODE_OF_CONDUCT.rst 0 additions, 144 deletionsCODE_OF_CONDUCT.rst
- CONTRIBUTING.rst 0 additions, 232 deletionsCONTRIBUTING.rst
- Dockerfile 0 additions, 97 deletionsDockerfile
- aleksis/core/settings.py 2 additions, 0 deletionsaleksis/core/settings.py
- apps/official/AlekSIS-App-Chronos 0 additions, 1 deletionapps/official/AlekSIS-App-Chronos
- apps/official/AlekSIS-App-DashboardFeeds 0 additions, 1 deletionapps/official/AlekSIS-App-DashboardFeeds
- apps/official/AlekSIS-App-Hjelp 0 additions, 1 deletionapps/official/AlekSIS-App-Hjelp
- apps/official/AlekSIS-App-LDAP 0 additions, 1 deletionapps/official/AlekSIS-App-LDAP
- apps/official/AlekSIS-App-Untis 0 additions, 1 deletionapps/official/AlekSIS-App-Untis
- ci/build_dist.yml 0 additions, 18 deletionsci/build_dist.yml
- ci/build_docker.yml 0 additions, 22 deletionsci/build_docker.yml
- ci/deploy.yml 0 additions, 30 deletionsci/deploy.yml
- ci/deploy_pypi.yml 0 additions, 11 deletionsci/deploy_pypi.yml
- ci/general.yml 0 additions, 24 deletionsci/general.yml
- ci/pages.yml 0 additions, 12 deletionsci/pages.yml
- ci/test.yml 0 additions, 26 deletionsci/test.yml
- docker-compose.yml 0 additions, 74 deletionsdocker-compose.yml
- docker/entrypoint.sh 0 additions, 33 deletionsdocker/entrypoint.sh
Loading
Please register or sign in to comment