A free open source IT asset/license management system
Merged markdown comments
sniped63a5007adab
diff --git a/resources/lang/en-US/admin/custom_fields/general.php b/resources/lang/en-US/admin/custom_fields/general.phpindex 977a7fb2f4..0c716b1a63 100644--- a/resources/lang/en-US/admin/custom_fields/general.php+++ b/resources/lang/en-US/admin/custom_fields/general.php@@ -68,6 +68,5 @@ return ['checkbox' => 'Checkbox','radio' => 'Radio Buttons',],- 'markdown_supported' => 'Markdown is supported','general_help_text' => 'Custom fields store additional information not covered by the default asset fields. <a href="https://snipe-it.readme.io/docs/custom-fields#/"><i class="fa fa-external-link"></i></a>.',];diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex 75c37b3619..f5e284e60c 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -223,7 +223,7 @@ return ['manage_api_keys' => 'Manage API keys','manufacturer' => 'Manufacturer','manufacturers' => 'Manufacturers',- 'markdown' => 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',+ 'markdown' => 'Markdown is supported','min_amt' => 'Min. QTY','min_amt_help' => 'Minimum number of this item that should be available for checkout before an alert gets triggered. Leave blank if you do not wish to receive alerts for low inventory.','model_no' => 'Model No.',