Skip to content

CIRCLE / cloud

Go to a project
Commit bbb1a96f by Szeberényi Imre
Options

Merge branch 'master' of https://git.ik.bme.hu/circle/cloud 

Conflicts:
	circle/vm/operations.py
parent 536ad962
Showing with 0 additions and 1 deletions
circle/circle/settings/base.py
...@@ -583,7 +583,6 @@ def GET_AGENT_VERSION_BY_SYSTEM(agent_system): ...@@ -583,7 +583,6 @@ def GET_AGENT_VERSION_BY_SYSTEM(agent_system):
return ret, AGENT_DIR + "/agent-" + agent_system.lower() + "-" + ret return ret, AGENT_DIR + "/agent-" + agent_system.lower() + "-" + ret
LOCALE_PATHS = (join(SITE_ROOT, 'locale'), )
COMPANY_NAME = get_env_variable("COMPANY_NAME", "BME IK 2015") COMPANY_NAME = get_env_variable("COMPANY_NAME", "BME IK 2015")
first, last = get_env_variable( first, last = get_env_variable(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment