snipe d8eb68af83 Merge branch 'hotfixes/accessory_model_number' into develop ... # Conflicts: # resources/views/accessories/edit.blade.php		2016-11-17 20:01:01 -08:00
..
assets	Removed console message from JS	2016-08-01 21:43:56 -07:00
lang	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
macros	Allow certain users to override 2FA with permission	2016-10-31 16:52:25 -07:00
views	Merge branch 'hotfixes/accessory_model_number' into develop	2016-11-17 20:01:01 -08:00