Skip to content
Snippets Groups Projects
Commit 7bd7d15b authored by Agustin Dorda's avatar Agustin Dorda
Browse files

Merge branch 'master' into 'resend-command'

# Conflicts:
#   app/managers.py
#   app/views.py
parents 8ca29eea bd88b3f8
No related branches found
No related tags found
No related merge requests found
Showing with 859 additions and 44 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment