Merged with master.

This commit is contained in:
Nicholas Staples
2016-01-22 14:46:03 +00:00
9 changed files with 177 additions and 12 deletions

View File

@@ -137,7 +137,7 @@ def send_user_code(user_id):
@user.route('/<int:user_id>', methods=['GET'])
@user.route('/', methods=['GET'])
@user.route('', methods=['GET'])
def get_user(user_id=None):
try:
users = get_model_users(user_id=user_id)