Dave Earley 539a0c4fec Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/Http/Controllers/OrganiserCustomizeController.php # app/Models/Account.php # app/Models/AccountPaymentGateway.php # composer.lock		2016-10-11 21:25:47 +01:00
..
lang/en	Update for Signup and Login	2016-03-09 23:05:39 +01:00
views	Merge remote-tracking branch 'origin/master'	2016-10-11 21:25:47 +01:00