Skip to content
Snippets Groups Projects
Commit efc700cb authored by Ravi Tripathi's avatar Ravi Tripathi
Browse files

Merge branch 'master' into 'feat-variable-consistency' 

# Conflicts:
#   app/__init__.py
#   messages.py
parents 1da8fa23 6f86d81d
No related branches found
No related tags found
No related merge requests found
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