diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2012-03-14 13:11:55 +0000 |
| commit | f465e32109d6600887f1c5765b44347a4cfaa3d7 (patch) | |
| tree | 3855e96d1d69683b388d82c27bad3f9e339f2792 /conf/general.yml-example | |
| parent | 1b15ca0aea334d20fb0f19fed36bc948668e2a14 (diff) | |
| parent | c9681f6bbc04659b9d6ed5eaa46b8c2edd704f9e (diff) | |
Merge branch 'redesign'
Conflicts:
.gitignore
notes/INSTALL
perllib/FixMyStreet/App/Controller/Photo.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'conf/general.yml-example')
| -rw-r--r-- | conf/general.yml-example | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example index 77319b24b..06af11a55 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -22,10 +22,11 @@ TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FixMyStreet' STAGING_SITE: 1 -UPLOAD_CACHE: '/upload/' +UPLOAD_DIR: '/upload/' GEO_CACHE: '/cache/' GOOGLE_MAPS_API_KEY: '' BING_MAPS_API_KEY: '' +KASABI_API_KEY: '' LONDON_REPORTIT_URL: '' LONDON_REPORTIT_KEY: '' |