snipe b9bab05ac3 Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master ...

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

# Conflicts:
#	resources/views/users/print.blade.php

2021-04-05 20:55:49 -07:00

..

web

Squashed commit of the following:

2020-08-31 12:17:19 -07:00

api.php

Added #6695: add API endpoint for license seats (#8058)

2021-03-29 19:41:26 -07:00

console.php

…

web.php

Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master

2021-04-05 20:55:49 -07:00