Skip to content
Snippets Groups Projects
Verified Commit 7741f64e authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into user-invitations

parents 9c872510 e0345796
No related branches found
No related tags found
1 merge request!450User invitations
Pipeline #47028 passed with warnings
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 0
View file @ 7741f64e
include:
- project: "AlekSIS/official/AlekSIS"
file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/prepare/lock.yml
- project: "AlekSIS/official/AlekSIS"
file: /ci/test/test.yml
- project: "AlekSIS/official/AlekSIS"
......
CHANGELOG.rst
+ 2
− 0
View file @ 7741f64e
......@@ -29,6 +29,8 @@ Changed
~~~~~~~
* Modified the appearance of tables for mobile users to be more user friendly
* [Dev] Remove lock file; locking dependencies is the distribution's
responsibility
Removed
~~~~~~~
......
poetry.lock deleted 100644 → 0
+ 0
− 5319
View file @ 9c872510
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment