snipe 93719b2214 Merge branch 'develop' of github.com:snipe/snipe-it into develop		2017-02-02 18:55:29 -08:00
..
assets	Tried to fix build environment/select2 (#3262)	2017-02-02 18:53:50 -08:00
lang	Check for valid category types in validation	2017-01-13 09:27:32 -08:00
macros	Switched ordering of status labels and status label types to more user-friednly config	2017-01-12 06:50:54 -08:00
views	Removed duplicate header	2017-02-02 18:54:31 -08:00