DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-29 14:41:35 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
snipe-it/resources/lang/en
History
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
..
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-03-03 21:59:38 -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