snipe 080a4c823b Merge remote-tracking branch 'origin/develop'		2023-03-30 14:49:19 -07:00
..
assets	Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased	2023-03-07 21:38:04 -08:00
lang	Merge pull request #12762 from spencerrlongg/feature/sc-20304	2023-03-30 12:37:50 -07:00
macros	Switched to translations for better autoglossonym support	2022-10-05 11:46:42 -07:00
views	Merge remote-tracking branch 'origin/develop'	2023-03-30 14:49:19 -07:00