snipe c3d55ee27e Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php		2021-12-16 14:26:24 -08:00
..
af	Merge master down into develop	2021-12-16 14:26:24 -08:00
am	Merge master down into develop	2021-12-16 14:26:24 -08:00
ar	Merge master down into develop	2021-12-16 14:26:24 -08:00
bg	Merge master down into develop	2021-12-16 14:26:24 -08:00
ca	Merge master down into develop	2021-12-16 14:26:24 -08:00
cs	Merge master down into develop	2021-12-16 14:26:24 -08:00
cy	Merge master down into develop	2021-12-16 14:26:24 -08:00
da	Merge master down into develop	2021-12-16 14:26:24 -08:00
de	Merge master down into develop	2021-12-16 14:26:24 -08:00
el	Merge master down into develop	2021-12-16 14:26:24 -08:00
en	Merge master down into develop	2021-12-16 14:26:24 -08:00
en-GB	Merge master down into develop	2021-12-16 14:26:24 -08:00
en-ID	Merge master down into develop	2021-12-16 14:26:24 -08:00
es-CO	Merge master down into develop	2021-12-16 14:26:24 -08:00
es-ES	Merge master down into develop	2021-12-16 14:26:24 -08:00
es-MX	Merge master down into develop	2021-12-16 14:26:24 -08:00
es-VE	Merge master down into develop	2021-12-16 14:26:24 -08:00
et	Merge master down into develop	2021-12-16 14:26:24 -08:00
fa	Merge master down into develop	2021-12-16 14:26:24 -08:00
fi	Merge master down into develop	2021-12-16 14:26:24 -08:00
fil	Merge master down into develop	2021-12-16 14:26:24 -08:00
fr	Merge master down into develop	2021-12-16 14:26:24 -08:00
ga-IE	Merge master down into develop	2021-12-16 14:26:24 -08:00
he	Merge master down into develop	2021-12-16 14:26:24 -08:00
hr	Merge master down into develop	2021-12-16 14:26:24 -08:00
hu	Merge master down into develop	2021-12-16 14:26:24 -08:00
id	Merge master down into develop	2021-12-16 14:26:24 -08:00
is	Merge master down into develop	2021-12-16 14:26:24 -08:00
it	Merge master down into develop	2021-12-16 14:26:24 -08:00
iu	Merge master down into develop	2021-12-16 14:26:24 -08:00
ja	Merge master down into develop	2021-12-16 14:26:24 -08:00
ko	Merge master down into develop	2021-12-16 14:26:24 -08:00
lt	Merge master down into develop	2021-12-16 14:26:24 -08:00
lv	Merge master down into develop	2021-12-16 14:26:24 -08:00
mi	Merge master down into develop	2021-12-16 14:26:24 -08:00
mk	Merge master down into develop	2021-12-16 14:26:24 -08:00
ml-IN	Merge master down into develop	2021-12-16 14:26:24 -08:00
mn	Merge master down into develop	2021-12-16 14:26:24 -08:00
ms	Merge master down into develop	2021-12-16 14:26:24 -08:00
nl	Merge master down into develop	2021-12-16 14:26:24 -08:00
no	Merge master down into develop	2021-12-16 14:26:24 -08:00
pl	Merge master down into develop	2021-12-16 14:26:24 -08:00
pt-BR	Merge master down into develop	2021-12-16 14:26:24 -08:00
pt-PT	Merge master down into develop	2021-12-16 14:26:24 -08:00
ro	Merge master down into develop	2021-12-16 14:26:24 -08:00
ru	Merge master down into develop	2021-12-16 14:26:24 -08:00
si-LK	Merge master down into develop	2021-12-16 14:26:24 -08:00
sk	Merge master down into develop	2021-12-16 14:26:24 -08:00
sl	Merge master down into develop	2021-12-16 14:26:24 -08:00
sr-CS	Merge master down into develop	2021-12-16 14:26:24 -08:00
sv-SE	Merge master down into develop	2021-12-16 14:26:24 -08:00
ta	Merge master down into develop	2021-12-16 14:26:24 -08:00
th	Merge master down into develop	2021-12-16 14:26:24 -08:00
tl	Merge master down into develop	2021-12-16 14:26:24 -08:00
tr	Merge master down into develop	2021-12-16 14:26:24 -08:00
uk	Merge master down into develop	2021-12-16 14:26:24 -08:00
ur-PK	Merge master down into develop	2021-12-16 14:26:24 -08:00
vendor/backup	Revert "Updated translations"	2020-10-08 18:43:06 -07:00
vi	Merge master down into develop	2021-12-16 14:26:24 -08:00
zh-CN	Merge master down into develop	2021-12-16 14:26:24 -08:00
zh-HK	Merge master down into develop	2021-12-16 14:26:24 -08:00
zh-TW	Merge master down into develop	2021-12-16 14:26:24 -08:00
zu	Merge master down into develop	2021-12-16 14:26:24 -08:00