Skip to content

Commit

Permalink
Merge pull request #3116 from matrix-org/clokep/bleecker
Browse files Browse the repository at this point in the history
Use the same domain for room ID and avatar URL.
  • Loading branch information
turt2live authored and richvdh committed Aug 27, 2021
2 parents 5e80d36 + 456353c commit 8792da2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelogs/client_server/newsfragments/3116.clarification
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix various typos throughout the specification.
1 change: 1 addition & 0 deletions changelogs/server_server/newsfragments/3116.clarification
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix various typos throughout the specification.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ example: {
"chunk": [
{
"aliases": ["#murrays:cheese.bar"],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE",
"avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false,
"name": "CHEESE",
"num_joined_members": 37,
Expand Down
2 changes: 1 addition & 1 deletion data/api/server-server/public_rooms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ paths:
"chunk": [
{
"aliases": ["#murrays:cheese.bar"],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE",
"avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false,
"name": "CHEESE",
"num_joined_members": 37,
Expand Down
2 changes: 1 addition & 1 deletion proposals/2403-knock.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ contain this information:
"aliases": [
"#murrays:cheese.bar"
],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE",
"avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false,
"name": "CHEESE",
"num_joined_members": 37,
Expand Down

0 comments on commit 8792da2

Please sign in to comment.