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

Merge branch 'master' into 65-add-week-select-to-week-view

# Conflicts:
#	aleksis/apps/alsijil/views.py
parents 3593daf5 49392296
No related branches found
No related tags found
1 merge request!73Resolve "Add week select to week view"
Showing
with 2742 additions and 1221 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment