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

Merge branch 'feature/virtualenv' into feature/tests

# Conflicts:
#	templates/receiver.sh
parents 6c6a6157 ba850340
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment