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

..

edit.blade.php

Switch to old() helper

2020-04-21 03:58:31 -07:00

index.blade.php

Features/better table options (#5018)

2018-02-16 13:22:55 -08:00

print.blade.php

Update print.blade.php

2019-05-03 15:22:01 +03:00

view.blade.php

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

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