snipe 90b8acdd3b Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js ... # Conflicts: # public/mix-manifest.json		2018-10-03 00:56:09 -07:00
..
accept
accept-asset.blade.php
api.blade.php
change-password.blade.php
profile.blade.php
requestable-assets.blade.php
requested.blade.php
view-assets.blade.php