snipe 9ea8316d74 Merge remote-tracking branch 'origin/develop' into 1.3.0 ...

# Conflicts:
#	app/config/version.php

2015-06-01 17:52:39 -07:00

..

backend

Merge remote-tracking branch 'origin/develop' into 1.3.0

2015-06-01 17:52:39 -07:00

emails

Removed test url

2015-02-26 18:56:30 -08:00

error

Fixes #806

2015-05-19 19:39:05 -07:00

frontend

Add if locked disable button

2015-03-26 05:54:14 +10:30

paginator

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00

hello.php

Updated spacing for PSR-2

2014-06-24 17:49:39 -04:00