1
0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00

merges 5.5 and master into next-back

This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
104 changed files with 1723 additions and 1828 deletions

View File

@@ -36,8 +36,9 @@ class BasicUserSerializer extends AbstractSerializer
}
return [
'username' => $user->username,
'avatarUrl' => $user->avatar_url
'username' => $user->username,
'displayName' => $user->display_name,
'avatarUrl' => $user->avatar_url
];
}