diff options
| author | Chris Mytton <self@hecticjeff.net> | 2013-09-13 12:12:14 +0100 |
|---|---|---|
| committer | Chris Mytton <self@hecticjeff.net> | 2013-09-13 12:12:14 +0100 |
| commit | b44f9edab53f59fb442e5ee4db28cb25408c652c (patch) | |
| tree | e7cd62bd148a5332e1ec625dda6c3bc6b09ceb62 /conf | |
| parent | 2099ac31a4410f2cf8e1c7d31dc35cdd9ac1e070 (diff) | |
| parent | 94ac7786132a538a5742ba325eb7fe9eff89cfc9 (diff) | |
Merge branch 'master' into oxfordshire-usability-recommendations
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/general.yml-example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/conf/general.yml-example b/conf/general.yml-example index d30c494ca..2f78de986 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -130,6 +130,7 @@ MAP_TYPE: 'OSM' ALLOWED_COBRANDS: - cobrand_one - cobrand_two: 'hostname_substring2' + - cobrand_three # This is only used in "offensive report" emails to provide a link directly to # the admin interface. If wanted, set to the full URL of your admin interface. @@ -166,3 +167,4 @@ LONDON_REPORTIT_KEY: '' LONDON_REPORTIT_SECRET: '' AUTH_SHARED_SECRET: '' HEARFROMYOURMP_BASE_URL: '' + |