Skip to content
Snippets Groups Projects
Commit baf20036 authored by Tobias Mieves's avatar Tobias Mieves :sparkles:
Browse files

Merge remote-tracking branch 'origin/main' into develop 

# Conflicts:
#	templates/base.html
parents 75c47e18 9885b873
No related branches found
No related tags found
1 merge request!18Change Layout of the base template
Pipeline #191204 passed with warnings
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment