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

..

bulk-edit.blade.php

Squashed commit of the following:

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

confirm-bulk-delete.blade.php

Merge branch 'develop' into integrations/2020-04-15-v5-merge

2020-04-20 23:20:34 -07:00

edit.blade.php

Moved a few of the user edit fields to make more sense (optional stuff further down)

2020-11-13 11:52:09 -08:00

index.blade.php

Fixed Input:: () vs request()

2020-08-31 17:18:09 -07:00

ldap.blade.php

Cleaned up LDAP sync blade

2020-04-23 22:44:28 -07:00

print.blade.php

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

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

view.blade.php

Added purchase order and order number to user > licenses view

2020-11-30 12:54:15 -08:00