David Baker 75f8363be0 Merge branch 'master' into vector

2015-07-16 16:53:27 +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

Display call logs in the UI.

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

pages

Merge branch 'master' into vector

2015-07-16 16:13:24 +01:00

templates

some s/then/done/

2015-07-16 16:53:08 +01:00