snipe-it/resources/lang/en/admin
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
2022-03-03 21:59:38 -08:00
..
accessories Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
asset_maintenances Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
categories Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
companies Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
components Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
consumables Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
custom_fields Added strings for unique 2022-02-16 13:47:59 -08:00
departments Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
depreciations Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
groups Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
hardware Merge pull request #10455 from adagioajanes/features/quickscan_checkin 2022-02-01 20:19:45 -08:00
importer Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
kits Updated language strings 2022-01-28 12:40:03 -08:00
licenses Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
locations Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
manufacturers Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
models Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
reports Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00
settings Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
statuslabels Updated language strings 2022-01-28 12:40:03 -08:00
suppliers Normalize array format in en language to the new shitty way 2022-01-13 21:30:35 -08:00
users Merge remote-tracking branch 'origin/master' into develop 2022-02-01 18:53:05 -08:00