snipe 904be03ffd Merge branch 'develop' of github.com:snipe/snipe-it into develop		2017-02-22 22:20:32 -08:00
..
assets	Changed font size	2017-02-10 18:42:38 -08:00
lang	Hotfix/translate row delete msg (#3305)	2017-02-21 14:25:46 -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	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2017-02-22 22:20:32 -08:00