A free open source IT asset/license management system
Merge branch 'develop' into xxdays-since-last-update
snipe96befb2aef66
diff --cc resources/lang/en-US/general.phpindex e1dd09e47f,f6b11c3f47..18da467370--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@@ -94,8 -100,11 +100,12 @@@ return'created_at' => 'Created At','created_by' => 'Created By','record_created' => 'Record Created',- 'updated_at' => 'Updated at',+ 'updated_at' => 'Updated At',+ 'updated_before' => 'Updated Before',+ 'updated_plain' => 'Updated',+ 'deleted_plain' => 'Deleted',+ 'purchased_plain' => 'Purchased',+ 'created_plain' => 'Created','currency' => '$', // this is deprecated'currency_text' => 'Currency', //'current' => 'Current',