Skip to content
Snippets Groups Projects
Commit b36e6f7d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into 'datepicker-i18n' 

# Conflicts:
#   pyproject.toml
parents 53d0b6ec ef24f472
No related branches found
No related tags found
1 merge request!122Load calendar labels from calendarweek library
Pipeline #668 failed
Stage: test
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 303 additions and 92 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