Merge branch 'develop'

Conflicts:
	Leapfile
	files/ssh/authorized_keys

1 files changed, 2 insertions, 3 deletions

diff --git a/Leapfile b/Leapfile
index 62aa634..723d144 100644
--- a/Leapfile
+++ b/Leapfile
@@ -1,4 +1,3 @@
-@platform_directory_path = '../leap_platform_master'
-@platform_branch = 'master'
+@platform_branch = 'develop'
+@platform_directory_path = '../leap_platform'
 @log = "/var/log/leap/bitmask.log"
-