Merge branch 'develop' of github.com:snipe/snipe-it into develop

This commit is contained in:
snipe 2017-04-06 20:08:52 -07:00
commit 120c08b3a3

View file

@ -157,7 +157,7 @@ trait Loggable
$log->user_id = Auth::user()->id; $log->user_id = Auth::user()->id;
$log->note = $note; $log->note = $note;
$log->target_id = null; $log->target_id = null;
$log->created_at = date("Y-m-d h:i:s"); $log->created_at = date("Y-m-d H:i:s");
$log->filename = $filename; $log->filename = $filename;
$log->logaction('uploaded'); $log->logaction('uploaded');