Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/gabstopper/stonesoft-aws
Browse files Browse the repository at this point in the history 
Conflicts:
	deploy/test.py
  • Loading branch information
@gabstopper
gabstopper committed Dec 2, 2016
2 parents c295bab + 300e1cf commit f96ae2d
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions deploy/test.py
View file

This file was deleted.

0 comments on commit f96ae2d

Please sign in to comment.