Skip to content
Snippets Groups Projects
Commit e606aba5 authored by Julian's avatar Julian
Browse files

Merge branch 'develop-dashboard-feeds' into '134-merge-dashboard-ajax'

# Conflicts:
#   aleksis/core/templates/core/index.html
#   aleksis/core/views.py
#   poetry.lock
#   pyproject.toml
parents aa9e3e11 1c80eb1e
No related branches found
No related tags found
Loading
Checking pipeline status