Merge remote-tracking branch 'origin/master' into send-report-rewrite

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 7 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Static.pm b/perllib/FixMyStreet/App/Controller/Static.pm
index 2e6bda28c..52b230c27 100755
--- a/perllib/FixMyStreet/App/Controller/Static.pm
+++ b/perllib/FixMyStreet/App/Controller/Static.pm
@@ -22,6 +22,13 @@ sub about : Global : Args(0) {
     # don't need to do anything here - should just pass through.
 }
 
+sub for_councils : Path('/for-councils') : Args(0) {
+    my ( $self, $c ) = @_;
+}
+sub for_councils_faq : Path('/for-councils/faq') : Args(0) {
+    my ( $self, $c ) = @_;
+}
+
 sub faq : Global : Args(0) {
     my ( $self, $c ) = @_;