Merge pull request #22 from JoyStream/development

dev to master - hotfix repo url

Author: mnaamani

conan_package/base.py

@@ -5,9 +5,9 @@ class ProtocolSessionBase(ConanFile):
     name = "ProtocolSession"
     version = "0.1.4"
     license = "(c) JoyStream Inc. 2016-2017"
-    url = "https://github.com/JoyStream/protocol_session-conan.git"
+    url = "https://github.com/JoyStream/protocol_session-cpp.git"
     repo_ssh_url = "git@github.com:JoyStream/protocol_session-cpp.git"
-    repo_https_url = "https://github.com/JoyStream/protocol_session-conan.git"
+    repo_https_url = "https://github.com/JoyStream/protocol_session-cpp.git"
     settings = "os", "compiler", "build_type", "arch"
     generators = "cmake"
     requires = "ProtocolStateMachine/0.1.2@joystream/stable"