Skip to content
Snippets Groups Projects
Commit ab8888a0 authored by Pierre-antoine Comby's avatar Pierre-antoine Comby
Browse files

Merge branch 'master' into 'alias' 

# Conflicts:
#   note_kfet/settings/base.py
#   note_kfet/urls.py
parents deb19e45 0193a4d8
No related branches found
No related tags found
1 merge request!31Alias
Pipeline #7836 passed with warnings with stages
in 4 minutes
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