snipe b215924b1a Merge branch 'develop' of github.com:snipe/snipe-it into develop		2017-10-20 17:18:13 -07:00
..
assets	Hopefully fixes #4150	2017-10-16 20:34:22 -07:00
lang	Added note about saving before testing LDAP	2017-10-19 16:35:59 -07: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-10-20 17:18:13 -07:00