aboutsummaryrefslogtreecommitdiffstats
path: root/notes
diff options
context:
space:
mode:
authorDave Whiteland <dave@mysociety.org>2013-02-06 15:08:23 +0000
committerDave Whiteland <dave@mysociety.org>2013-02-06 15:08:23 +0000
commit0f24a44cd6e8b056db482cb91c85768b6d1e7d1d (patch)
tree09a90f38574ee62754f3c8ac077152ed99a38296 /notes
parentc061769ba72f420e2f2c6064fa526648e57339f1 (diff)
parent5b2e18389734751165d2eeb21a3b3f2e8d2e8755 (diff)
Merge remote branch 'origin/master' into oxfordshire-header
Diffstat (limited to 'notes')
-rw-r--r--notes/cobranding.txt2
-rw-r--r--notes/states.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/notes/cobranding.txt b/notes/cobranding.txt
index db71c87ce..bb6d8f195 100644
--- a/notes/cobranding.txt
+++ b/notes/cobranding.txt
@@ -13,7 +13,7 @@ NB: this is moderately specific to producing cobrands for UK councils
site_restriction
problems_clause
enter_postcode_text
- council_check
+ area_check
base_url
all_councils_report should return 0
disambiguate_location - see below for details on this
diff --git a/notes/states.txt b/notes/states.txt
index 70515c41b..32f9beb1a 100644
--- a/notes/states.txt
+++ b/notes/states.txt
@@ -22,7 +22,7 @@ the problem has been reported to:
Open ( a synonym for confirmed )
Investigating
Planned
- In Progress
+ In progress
Fixed
Closed