Merge pull request #6513 from edx/release

Merge release back into master
This commit is contained in:
Dennis Jen
2015-01-09 09:15:57 -05:00

View File

@@ -184,6 +184,7 @@ LOGGING = get_logger_config(LOG_DIR,
#theming start:
PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', 'edX')
STUDIO_NAME = ENV_TOKENS.get('STUDIO_NAME', 'edX Studio')
# Event Tracking
if "TRACKING_IGNORE_URL_PATTERNS" in ENV_TOKENS: