Skip to content
Snippets Groups Projects
Commit dfcc96c6 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

resolve conflict

parents 3bae4aac 1a4d0953
No related branches found
No related tags found
2 merge requests!787Release,!749Add personal calendars, move from requests-cache to Django cache
Pipeline #12339 failed
Stage: build

Pirátský GitLab - Home of the CopyLeft