snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php

2022-06-29 04:58:13 -07:00

..

assets

Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix

2022-06-23 18:31:36 -07:00

lang

Show model files on hardware page

2022-06-28 16:17:46 -07:00

macros

Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]

2021-08-17 21:59:33 -07:00

views

Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset

2022-06-29 04:58:13 -07:00