Skip to content
Snippets Groups Projects
Commit 60830a10 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into 'error-pages' 

# Conflicts:
#   biscuit/core/views.py
parents 2d02b2ac efe444f0
No related branches found
No related tags found
1 merge request!25Use custom caption per error.
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