Graham Campbell 1607275d2d Merge branch '2.0' ...

# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php

2015-12-18 12:55:47 +00:00

..

auth

User can login with username or email

2015-12-16 19:15:03 +08:00

dashboard

Merge branch '2.0'

2015-12-18 12:55:47 +00:00

emails

…

layout

Fixes #1234

2015-12-16 18:02:04 +00:00

partials

Fixes #1218

2015-12-16 18:15:25 +00:00

incident.blade.php

…

index.blade.php

…

setup.blade.php

…

signup.blade.php

…

subscribe.blade.php

…