This reverts commit 9dd1939d1f, reversing changes made to 8dfdfcb522. # Conflicts: # app/config/collections/common.php # app/controllers/api/users.php # app/init/resources.php # composer.lock
9dd1939d1f
8dfdfcb522