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
..
accept	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
api.blade.php	Another typo	2022-06-29 00:24:33 -07:00
change-password.blade.php	Added localized strings for account	2021-11-02 10:13:22 +01:00
profile.blade.php	Fixed escaped string	2022-01-12 11:20:31 -08:00
requestable-assets.blade.php	Update views with additional data fields	2022-06-05 21:03:56 -07:00
requested.blade.php	Added localized strings for account	2021-11-02 10:13:22 +01:00
view-assets.blade.php	Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php	2021-11-02 10:40:41 +01:00