Merge branch 'master' into 60-include-substitutions-print-view
# Conflicts: # aleksis/apps/chronos/views.py
No related branches found
No related tags found
This commit is part of merge request !34. Comments created here will be created in the context of that merge request.
Showing
- aleksis/apps/chronos/models.py 28 additions, 2 deletionsaleksis/apps/chronos/models.py
- aleksis/apps/chronos/util/min_max.py 0 additions, 19 deletionsaleksis/apps/chronos/util/min_max.py
- aleksis/apps/chronos/util/prev_next.py 8 additions, 8 deletionsaleksis/apps/chronos/util/prev_next.py
- aleksis/apps/chronos/views.py 6 additions, 5 deletionsaleksis/apps/chronos/views.py
- poetry.lock 67 additions, 33 deletionspoetry.lock
Loading
Please register or sign in to comment