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

# Conflicts:
#	app/controllers/admin/AssetsController.php

2015-07-24 15:56:10 -07:00

..

.gitkeep

Initial laravel import

2013-11-13 01:59:39 -05:00

AppCommand.php

Fix email field so it's nullable, fix app command to add user

2015-06-23 00:11:54 -07:00

ImportCommand.php

Added purchase date to importer

2015-07-17 16:25:20 -07:00

SendExpirationAlerts.php

Fixes #280, #64 and #860 - added license expiration alert

2015-06-23 01:52:06 -07:00

SystemBackup.php

Automated backup to dump SQL and zip uploaded files

2015-06-22 15:52:26 -07:00

Versioning.php

Better version output

2015-02-28 15:18:31 -08:00