snipe 2b826c3adc Merge branch 'features/mail_test_button' into develop		2017-10-19 08:19:24 -07:00
..
assets	Hopefully fixes #4150	2017-10-16 20:34:22 -07:00
lang	Fixes 500 in bulk checkout if no asset is selected	2017-10-18 07:15:16 -07:00
macros	Adds d.m.Y as date format, per #2423	2017-10-18 10:30:25 -07:00
views	Merge branch 'features/mail_test_button' into develop	2017-10-19 08:19:24 -07:00