288cc01c41
# Conflicts: # app/Http/Controllers/Api/UsersController.php # config/version.php # routes/api.php
# Conflicts: # app/Http/Controllers/Api/UsersController.php # config/version.php # routes/api.php