David Baker a6f857e9d8 Merge pull request #6 from matrix-org/voip ...

VoIP addition

2015-07-16 12:31:36 +01:00

..

atoms

Merge pull request #6 from matrix-org/voip

2015-07-16 12:31:36 +01:00

molecules

Merge pull request #6 from matrix-org/voip

2015-07-16 12:31:36 +01:00

organisms

Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings

2015-07-16 10:46:40 +01:00

pages

Merge pull request #6 from matrix-org/voip

2015-07-16 12:31:36 +01:00

templates

Improve registration so the container page can pick what URL it's going to route through to registration.

2015-07-15 20:33:12 +01:00