snipe 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 ...

# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php

2015-07-08 18:07:53 -07:00

..

artisan.php

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

2015-07-08 18:07:53 -07:00

global.php

alpha 0.4.0 release candidate

2014-08-11 17:13:43 +09:00

local.php

Updated spacing for PSR-2

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