Merge branch 'master' into bromley

Conflicts:
	bin/send-reports
	conf/crontab.ugly
	conf/general.yml-example
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/DB/Result/Comment.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/Result/User.pm
	templates/web/default/js/validation_strings.html
	templates/web/fixmystreet/auth/sign_out.html
	templates/web/fixmystreet/report/new/councils_text_all.html
	web/cobrands/fixmystreet/_base.scss

1 files changed, 0 insertions, 26 deletions

diff --git a/web/cobrands/barnet/javascript/styleswitch.js b/web/cobrands/barnet/javascript/styleswitch.js
deleted file mode 100644
index c4afb0b28..000000000
--- a/web/cobrands/barnet/javascript/styleswitch.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**

-* Styleswitch stylesheet switcher built on jQuery

-* Under an Attribution, Share Alike License

-* By Kelvin Luck ( http://www.kelvinluck.com/ )

-**/

-

-$(document).ready(function() {

-	$('.styleswitch').click(function()

-	{

-		switchStylestyle(this.getAttribute("rel"));

-		return false;

-	});

-	var c = readCookie('style');

-	if (c) switchStylestyle(c);

-});

-

-function switchStylestyle(styleName)

-{

-	$('link[@rel*=style][@title]').each(function(i) 

-	{

-		this.disabled = true;

-		if (this.getAttribute('title') == styleName) this.disabled = false;

-	});

-	createCookie('style', styleName, 365);

-}

-