Merge branch 'redesign'

Conflicts:
	.gitignore
	notes/INSTALL
	perllib/FixMyStreet/App/Controller/Photo.pm
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 7 insertions, 7 deletions

diff --git a/t/map/tilma/original.t b/t/map/tilma/original.t
index 3add7719e..04c4d578c 100644
--- a/t/map/tilma/original.t
+++ b/t/map/tilma/original.t
@@ -56,31 +56,31 @@ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create(
 for my $test ( 
     {
         state => 'fixed', 
-        colour => 'green',
+        colour => 'yellow',
     },
     {
         state => 'fixed - user', 
-        colour => 'green',
+        colour => 'yellow',
     },
     {
         state => 'fixed - council', 
-        colour => 'green',
+        colour => 'yellow',
     },
     {
         state => 'confirmed', 
-        colour => 'red',
+        colour => 'yellow',
     },
     {
         state => 'investigating', 
-        colour => 'red',
+        colour => 'yellow',
     },
     {
         state => 'planned', 
-        colour => 'red',
+        colour => 'yellow',
     },
     {
         state => 'in progress', 
-        colour => 'red',
+        colour => 'yellow',
     },
 ) {
     subtest "pin colour for state $test->{state}" => sub {