snipe 86a6322562 Merge branch 'fixes/make_serial_nullable' into develop ... # Conflicts: # app/Http/Controllers/Api/ConsumablesController.php # config/version.php		2019-02-20 20:48:51 -08:00
..
factories	Fixed mac address regex	2018-09-29 22:41:17 -07:00
migrations	Merge branch 'fixes/make_serial_nullable' into develop	2019-02-20 20:48:51 -08:00
seeds	Fixed: Settings seeder error (#6334)	2018-10-17 13:38:27 -07:00
.gitignore	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00