diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-08-22 10:57:10 +0100 |
| commit | 2e0a4e8ec45579e4e5c9cf8aa123d5ab215b9703 (patch) | |
| tree | c13e3c59b686e01460dc7960547f7e9c53c288bd /notes/no-update-server | |
| parent | b99c5ff97b29a27eeba52ed24385ac30388e875c (diff) | |
| parent | 88a7d38dffa3dabdf0f85573b254cea9c8ab232b (diff) | |
Merge remote-tracking branch 'origin/master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
conf/general.yml-example
perllib/FixMyStreet/App/Controller/Council.pm
perllib/FixMyStreet/App/Controller/Report/New.pm
perllib/FixMyStreet/Cobrand/Default.pm
templates/web/default/around/around_index.html
templates/web/default/index.html
templates/web/emptyhomes/index.html
templates/web/fixmystreet/around/around_index.html
templates/web/fixmystreet/index.html
web/fixmystreet_app_cgi.cgi
web/fixmystreet_app_fastcgi.cgi
Diffstat (limited to 'notes/no-update-server')
| -rw-r--r-- | notes/no-update-server | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/notes/no-update-server b/notes/no-update-server index 1f59c0116..2d149d850 100644 --- a/notes/no-update-server +++ b/notes/no-update-server @@ -318,7 +318,6 @@ BASE_URL: 'http://$servername' EMAIL_DOMAIN: 'nuug.no' CONTACT_EMAIL: '' -TEST_EMAIL_PREFIX: '' CONTACT_NAME: 'FiksGataMi' STAGING_SITE: 1 @@ -329,7 +328,6 @@ GOOGLE_MAPS_API_KEY: '' MAPIT_URL: 'http://mapit.nuug.no' MAP_TYPE: 'OSM' -EVEL_URL: '' GAZE_URL: 'http://gaze.mysociety.org/gaze' # empty = use /usr/sbin/sendmail' @@ -338,12 +336,8 @@ SMTP_SMARTHOST: '' AUTH_SHARED_SECRET: '' HEARFROMYOURMP_BASE_URL: '' -IPHONE_URL: '' ANDROID_URL: 'http://wiki.nuug.no/grupper/fiksgatami/android' -# Log file (used in test harness, and later in admin scripts) -HTTPD_ERROR_LOG: '/var/log/apache/error.log - ALLOWED_COBRANDS: 'fiksgatami' # How many items are returned in the GeoRSS feeds by default |