snipe 5e9740e0b4 Merge branch 'develop' of github.com:snipe/snipe-it into develop		2016-08-12 17:10:10 -07:00
..
assets	Removed console message from JS	2016-08-01 21:43:56 -07:00
lang	Import history language file	2016-08-12 16:02:51 -07:00
macros	Added macro for email/username format	2016-06-01 15:44:16 -07:00
views	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-08-12 17:10:10 -07:00