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

Merge branch 'master' into '1215-oauth-activate-upload-of-icons' 

# Conflicts:
#   CHANGELOG.rst
parents f660ace6 19abab29
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
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