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
lang	Added some translations for Slack integration	2020-09-15 23:05:42 -07:00
macros
views	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2020-09-16 12:40:23 -07:00