snipe 5ce7882bf5 Merge branch 'develop' of github.com:snipe/snipe-it into develop		2017-11-08 17:01:50 -08:00
..
assets	Fixed #4390 - results couldn’t be loaded error	2017-11-08 00:57:43 -08:00
lang	Added ability to disable the alert icon in the top menu	2017-11-08 03:08:17 -08:00
macros	Adds d.m.Y as date format, per #2423	2017-10-18 10:30:25 -07:00
views	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-11-08 17:01:50 -08:00