Filip/matrix-spec
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-spec synced 2026-01-22 23:33:43 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3116 from matrix-org/clokep/bleecker

Browse source 
Use the same domain for room ID and avatar URL.
This commit is contained in:
Travis Ralston 2021-04-13 19:00:21 -06:00 committed by Richard van der Hoff
parent 5e80d36511 456353c8b4
commit 8792da2ee0
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelogs/client_server/newsfragments/3116.clarification Normal file
View file

@ -0,0 +1 @@
Fix various typos throughout the specification.

1
changelogs/server_server/newsfragments/3116.clarification Normal file
View file

@ -0,0 +1 @@
Fix various typos throughout the specification.

2
data/api/client-server/definitions/public_rooms_response.yaml
View file

@ -90,7 +90,7 @@ example: {
"chunk": [ "chunk": [
{ {
"aliases": ["#murrays:cheese.bar"], "aliases": ["#murrays:cheese.bar"],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false, "guest_can_join": false,
"name": "CHEESE", "name": "CHEESE",
"num_joined_members": 37, "num_joined_members": 37,

2
data/api/server-server/public_rooms.yaml
View file

@ -215,7 +215,7 @@ paths:
"chunk": [ "chunk": [
{ {
"aliases": ["#murrays:cheese.bar"], "aliases": ["#murrays:cheese.bar"],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false, "guest_can_join": false,
"name": "CHEESE", "name": "CHEESE",
"num_joined_members": 37, "num_joined_members": 37,

2
proposals/2403-knock.md
View file

@ -199,7 +199,7 @@ contain this information:
"aliases": [ "aliases": [
"#murrays:cheese.bar" "#murrays:cheese.bar"
], ],
"avatar_url": "mxc://bleeker.street/CHEDDARandBRIE", "avatar_url": "mxc://bleecker.street/CHEDDARandBRIE",
"guest_can_join": false, "guest_can_join": false,
"name": "CHEESE", "name": "CHEESE",
"num_joined_members": 37, "num_joined_members": 37,