snipe 4e1472f66d Merge remote-tracking branch 'origin/v3' into v3-master		2016-06-10 00:48:33 -07:00
..
assets	More layout fixes for small devices.	2016-06-01 21:37:03 -05:00
lang	Fixed barcode descriptions	2016-06-08 23:28:44 -07:00
macros	Added macro for email/username format	2016-06-01 15:44:16 -07:00
views	Merge remote-tracking branch 'origin/v3' into v3-master	2016-06-10 00:48:33 -07:00