Skip to content
Snippets Groups Projects
Commit 099c7613 authored by ynerant's avatar ynerant
Browse files

Merge branch 'master' into 'fix_signin' 

# Conflicts:
#   note_kfet/settings/development.py
parents 8f1caddb b47a45e0
Pipeline #7854 passed with warnings with stages
in 4 minutes and 2 seconds
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