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

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

# Conflicts:
#	aleksis/core/templates/core/index.html
#	aleksis/core/views.py
#	poetry.lock
#	pyproject.toml
parents 1c80eb1e aa9e3e11
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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