Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Showing
- CHANGES.rst 19 additions, 0 deletionsCHANGES.rst
- VERSION 1 addition, 1 deletionVERSION
- docs/client-server/howto.rst 5 additions, 5 deletionsdocs/client-server/howto.rst
- docs/client-server/model/presence.rst 0 additions, 0 deletionsdocs/client-server/model/presence.rst
- docs/client-server/model/profiles.rst 0 additions, 0 deletionsdocs/client-server/model/profiles.rst
- docs/client-server/model/protocol_examples.rst 0 additions, 0 deletionsdocs/client-server/model/protocol_examples.rst
- docs/client-server/model/room-join-workflow.rst 0 additions, 0 deletionsdocs/client-server/model/room-join-workflow.rst
- docs/client-server/model/rooms.rst 0 additions, 0 deletionsdocs/client-server/model/rooms.rst
- docs/client-server/model/terminology.rst 0 additions, 0 deletionsdocs/client-server/model/terminology.rst
- docs/client-server/model/third-party-id.rst 0 additions, 0 deletionsdocs/client-server/model/third-party-id.rst
- docs/human-id-rules.rst 79 additions, 0 deletionsdocs/human-id-rules.rst
- docs/specification.rst 27 additions, 1 deletiondocs/specification.rst
- jsfiddles/create_room_send_msg/demo.js 6 additions, 1 deletionjsfiddles/create_room_send_msg/demo.js
- jsfiddles/event_stream/demo.js 6 additions, 1 deletionjsfiddles/event_stream/demo.js
- jsfiddles/example_app/demo.details 7 additions, 0 deletionsjsfiddles/example_app/demo.details
- jsfiddles/register_login/demo.js 12 additions, 2 deletionsjsfiddles/register_login/demo.js
- jsfiddles/room_memberships/demo.js 6 additions, 1 deletionjsfiddles/room_memberships/demo.js
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/federation/units.py 1 addition, 0 deletionssynapse/federation/units.py
- synapse/handlers/room.py 6 additions, 0 deletionssynapse/handlers/room.py
Loading
Please register or sign in to comment