snipe-it/resources/lang
snipe 453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master
# Conflicts:
#	.all-contributorsrc
#	.nvmrc
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/ConsumablesController.php
#	app/Http/Controllers/Api/ImportController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/UsersController.php
#	app/Models/Ldap.php
#	composer.json
#	composer.lock
#	config/version.php
#	public/css/build/all.css
#	public/css/dist/all.css
#	public/css/skins/skin-contrast.css
#	public/css/skins/skin-contrast.css.map
#	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
#	resources/assets/less/overrides.less
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	resources/views/modals/model.blade.php
#	resources/views/modals/user.blade.php
#	resources/views/users/index.blade.php
#	routes/api.php
#	tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
..
af
ar
bg
cs
cy Updated translations 2019-12-06 12:03:04 -08:00
da
de Added: allow appending of domain name to username when user tries to login (#7790) 2020-02-04 12:47:49 -08:00
el Updated translations 2019-12-06 12:03:04 -08:00
en Merge branch 'develop' into integrations/2020-08-31-dev-into-master 2020-08-31 12:44:03 -07:00
en-GB Squashed commit of the following: 2020-08-31 12:17:19 -07:00
en-ID
es-CO Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
es-ES Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
es-MX
es-VE Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
et Updated translations 2019-12-06 12:03:04 -08:00
fa
fi Updated translations 2019-12-06 12:03:04 -08:00
fil
fr Updated translations 2019-12-06 12:03:04 -08:00
ga-IE
he
hr Updated translations 2019-12-06 12:03:04 -08:00
hu Updated translations 2019-12-06 12:03:04 -08:00
id
is Updated translations 2019-12-06 12:03:04 -08:00
it
iu Updated translations 2019-12-06 12:03:04 -08:00
ja Updated translations 2019-12-06 12:03:04 -08:00
ko
lt
lv Updated translations 2019-12-06 12:03:04 -08:00
mi
mk
mn
ms Updated translations 2019-12-06 12:03:04 -08:00
nl Updated translations 2019-12-06 12:03:04 -08:00
no
pl Updated translations 2019-12-06 12:03:04 -08:00
pt-BR
pt-PT Updated translations 2019-12-06 12:03:04 -08:00
ro
ru
sl
sr-CS
sv-SE Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ta
th
tl Updated translations 2019-12-06 12:03:04 -08:00
tr
uk Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ur-PK Updated translations 2019-12-06 12:03:04 -08:00
vendor/backup
vi Updated translations 2019-12-06 12:03:04 -08:00
zh-CN
zh-HK
zh-TW
zu