diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-04-03 10:37:39 +0100 |
| commit | 592924059a07a5a30e8a09dfc4ca8dea56c5c77a (patch) | |
| tree | c99e86d3e3f780427bbf7a9ec0ae5187b697dfa5 /notes/no-update-server | |
| parent | 65066d275557e16448aa99ecdfa4df62d4d79649 (diff) | |
| parent | d92bbef188eff6c14adf0f0c7b032846b1be85a6 (diff) | |
Merge remote-tracking branch 'origin/master' into send-report-rewrite
Conflicts:
bin/send-reports
perllib/FixMyStreet/Cobrand/Default.pm
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'notes/no-update-server')
| -rw-r--r-- | notes/no-update-server | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes/no-update-server b/notes/no-update-server index ad1ce26e2..1f59c0116 100644 --- a/notes/no-update-server +++ b/notes/no-update-server @@ -323,7 +323,7 @@ TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FiksGataMi' STAGING_SITE: 1 -UPLOAD_CACHE: '/var/lib/fixmystreet/upload/' +UPLOAD_DIR: '/var/lib/fixmystreet/upload/' GEO_CACHE: '/var/lib/fixmystreet/cache/' GOOGLE_MAPS_API_KEY: '' |