snipe b3c386663f Merge branch 'develop' ... # Conflicts: # config/version.php		2017-12-01 21:11:33 -08:00
..
CreateAdmin.php	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
DisableLDAP.php	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
FixDoubleEscape.php	Added additional models for #3702	2017-07-08 14:49:43 -07:00
LdapSync.php	Fix for LDAP where location ou is not null but blank	2017-10-17 16:59:50 -07:00
ObjectImportCommand.php	Remove conditional related to no longer existant testrun option. (#4079)	2017-09-29 17:31:39 -07:00
PaveIt.php	Importer mapping - v1 (#3677)	2017-06-21 16:37:37 -07:00
Purge.php	Add presenters for models. (#3098)	2016-12-23 17:52:00 -08:00
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	Assorted fixes (#3923)	2017-09-05 17:54:58 -07:00
SendExpirationAlerts.php	Save Progress.	2016-12-27 19:24:41 -05:00
SendInventoryAlerts.php	Translate emails (#2652)	2016-09-26 14:13:07 -07:00
SyncAssetLocations.php	Ignore deleted assets and check for valid location in artisan command	2017-11-04 16:20:31 -07:00
SystemBackup.php	Formatting fixes for coding standards	2016-06-22 12:27:41 -07:00
Version.php	Bumped version	2017-12-01 20:49:04 -08:00