snipe 288cc01c41 Merge branch 'features/accessories_users' into develop ... # Conflicts: # app/Http/Controllers/Api/UsersController.php # config/version.php # routes/api.php		2019-03-01 17:30:03 -08:00
..
web	Monster: Cleanup/Refactor http controllers. (#5916)	2018-07-24 19:35:26 -07:00
api.php	Merge branch 'features/accessories_users' into develop	2019-03-01 17:30:03 -08:00
console.php	Discussion: Moving to policies for controller based authorization (#3080)	2016-12-19 11:04:28 -08:00
web.php	Redirects users from old acceptance screen to new overview	2018-09-10 17:13:16 +02:00