David Baker 41f659db4c Merge branch 'master' into vector		2015-07-16 12:44:42 +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 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	Refactor view/controller logic between files, fix syntax & silly bugs.	2015-07-16 12:44:04 +01:00