David Baker 3a6423dd0a Merge branch 'master' into vector

2015-07-16 16:52:19 +01:00

..

atoms

Merge pull request #6 from matrix-org/voip

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

molecules

Move position of incoming call buttons.

2015-07-16 16:32:21 +01:00

organisms

Move position of incoming call buttons.

2015-07-16 16:32:21 +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

Merge branch 'master' into vector

2015-07-16 16:52:19 +01:00