snipe-it/resources/lang/en
snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop
# Conflicts:
#	.all-contributorsrc
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/ImportsController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Requests/ItemImportRequest.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/version.php
#	docker/startup.sh
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json
2019-03-20 02:17:02 -07:00
..
admin Added translation, removed commented out code 2019-03-13 12:15:48 -07:00
auth Use username instead of email address in password reset (#6382) 2018-10-31 18:03:24 -07:00
button.php Fixed #4301 - added image upload to audit 2018-04-24 02:54:54 -07:00
general.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
help.php More help text updates 2018-10-04 21:14:45 -07:00
mail.php Features/nicer notifications (#5886) 2018-07-18 19:15:45 -07:00
pagination.php Updated translation strings with new purge text 2016-04-19 12:26:49 -07:00
passwords.php Use username instead of email address in password reset (#6382) 2018-10-31 18:03:24 -07:00
reminders.php Updated translation strings with new purge text 2016-04-19 12:26:49 -07:00
table.php Updated translation strings with new purge text 2016-04-19 12:26:49 -07:00
validation.php Fix #6763. Import Stuck Processing - Error - Can only flip STRING and INTEGER values! (#6804) 2019-03-14 12:32:40 -07:00