snipe e8dfb71682 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop ...

# Conflicts:
#	resources/views/settings/slack.blade.php

2020-09-16 12:40:23 -07:00

..

assets

Added debugging to file upload for easier diagnostics

2020-09-15 20:07:46 -07:00

lang

Added some translations for Slack integration

2020-09-15 23:05:42 -07:00

macros

Squashed commit of the following:

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

views

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

2020-09-16 12:40:23 -07:00