snipe 244eceadec Merge branch 'develop' ... # Conflicts: # config/version.php		2017-12-04 23:51:53 -08:00
..
CreateAdmin.php
DisableLDAP.php
FixDoubleEscape.php
LdapSync.php	Fix for LDAP where location ou is not null but blank	2017-10-17 16:59:50 -07:00
ObjectImportCommand.php
PaveIt.php
Purge.php
RecryptFromMcrypt.php	Merge branch 'develop'	2017-11-03 21:53:13 -07:00
RegenerateAssetTags.php	Fixed #4190 - Added artisan command to regenerate asset tags	2017-11-24 11:25:51 -08:00
ResetDemoSettings.php	Set snipe-logo as default	2017-10-07 14:49:36 -07:00
SendExpectedCheckinAlerts.php
SendExpirationAlerts.php
SendInventoryAlerts.php
SyncAssetLocations.php	Cleaner re-implementation of loop-detection for asset-assigned-assets (#4553)	2017-12-04 23:00:55 -08:00
SystemBackup.php
Version.php	Bumped version	2017-12-01 20:49:04 -08:00