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

..

.gitkeep

Initial laravel import

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

AppCommand.php

Fixes #818, and randomizes password for dummy user

2015-05-27 11:45:44 -07:00

SendExpirationAlerts.php

Fixes #795 - add model name if no asset name

2015-05-11 19:23:11 -07:00

Versioning.php

Better version output

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