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

Merge branch '831-data-management-for-the-model-room' into manage-holidays 

# Conflicts:
#	CHANGELOG.rst
#	aleksis/core/frontend/plugins/aleksis.js
#	aleksis/core/managers.py
#	aleksis/core/schema/__init__.py
parents e30ea1b1 c34da04e
No related branches found
No related tags found
1 merge request!1261Manage holidays
Hide whitespace changes
Inline Side-by-side
Showing
with 482 additions and 427 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