Skip to content
Snippets Groups Projects
Commit ae90a957 authored by me5na7qbjqbrp's avatar me5na7qbjqbrp
Browse files

Merge branch 'master' into 'turbolinks' 

# Conflicts:
#   apps/note/views.py
parents 82355135 9ef2bc8b
No related branches found
No related tags found
1 merge request!15Turbolinks
Pipeline #7770 passed with stages
in 3 minutes and 49 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