Skip to content
Commit 3dfe2b07 authored by nimrod's avatar nimrod
Browse files

Merge branch 'feature/virtualenv' into feature/tests 

# Conflicts:
#	templates/receiver.sh
parents 6c6a6157 ba850340
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