Daniel Meltzer 9c4c91063f Merge branch 'v3' into Fix-Asset-Creation-with-old-data		2016-06-10 07:35:30 -05: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 branch 'v3' into Fix-Asset-Creation-with-old-data	2016-06-10 07:35:30 -05:00