David Baker cf38b8a5bb Merge branch 'master' into vector

2015-07-16 14:19:50 +01:00

..

atoms

Merge pull request #6 from matrix-org/voip

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

molecules

Display call logs in the UI.

2015-07-16 13:30:14 +01:00

organisms

Merge pull request #6 from matrix-org/voip

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

pages

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

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

templates

Don't forget form values on error

2015-07-16 14:19:13 +01:00