JonathanWilliamson/bconla
0
0
Fork 1
forked from infrastructure/conference-website
Code Issues Pull Requests Activity

Adding placeholder text in the presentation proposal form #1

Closed
Jason van Gumster wants to merge 16 commits from (deleted):proposal_placeholders into staging
pull from: (deleted):proposal_placeholders
merge into: JonathanWilliamson:staging

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 5 +2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b937f1eb5 - Show all commits

2
conference/settings.py
View File

@ -29,6 +29,8 @@ INSTALLED_APPS.append('storages')
SITE_ID = int(os.environ.get('SITE_ID')) SITE_ID = int(os.environ.get('SITE_ID'))
SITE_ID = 2
BLENDER_ID = { BLENDER_ID = {
# MUST end in a slash: # MUST end in a slash:
'BASE_URL': os.environ.get('BASE_URL'), 'BASE_URL': os.environ.get('BASE_URL'),