Skip to content
Snippets Groups Projects
Verified Commit aecffb12 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into feature/show-announcements-on-dashboard 

# Conflicts:
#	aleksis/core/models.py
parents 53052575 205b79b0
No related branches found
No related tags found
1 merge request!161Show announcements on dashboard
Pipeline #883 failed
Stage: test
Stage: build
Stage: deploy
Hide 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.
Finish editing this message first!
Please register or to comment