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

Merge branch 'calendar-object-feeds' into 831-data-management-for-the-model-room 

# Conflicts:
#	aleksis/core/frontend/index.js
#	aleksis/core/frontend/messages/en.json
#	aleksis/core/frontend/plugins/aleksis.js
#	aleksis/core/schema/__init__.py
#	pyproject.toml
parents 85e41811 ed3a99a2
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 755 additions and 9 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