DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
snipe-it/resources/lang/en
History
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -08:00
..
account Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
admin Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
auth Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
partials/forms Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
auth.php Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
button.php Updated language strings 2022-01-28 12:40:03 -08:00
general.php Fixed string 2022-02-10 21:05:23 -08:00
help.php Updated language strings 2022-01-28 12:40:03 -08:00
mail.php Updated language strings 2022-01-28 12:40:03 -08:00
pagination.php Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
passwords.php Updated language string 2022-02-11 15:55:42 -08:00
reminders.php Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
table.php Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
validation.php Updated language strings 2022-01-28 12:40:03 -08:00