snipe 400907cc40 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop		2019-03-08 16:24:12 -08:00
..
assets	Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop	2019-03-08 16:18:48 -08:00
lang	Allow multiple upload fields and add logo option to labels (#6736)	2019-03-01 15:25:42 -08:00
macros	Added Icelandic and Serbian to locale list	2018-09-28 11:47:59 -07:00
views	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2019-03-08 16:24:12 -08:00