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

..

assets

Added update checking, part of #109

2015-11-29 11:00:10 +00:00

lang

Merge pull request #1231 from phecho/dev-login

2015-12-16 18:03:47 +00:00

views

Merge branch '2.0'

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