Merge branch 'develop' into matthew/scalar

2016-08-04 13:41:04 +01:00
parent 4dfb0e9a90 34a31a71fd
commit eb108c7866
68 changed files with 1449 additions and 364 deletions
@@ -24,7 +24,7 @@ var Modal = require('matrix-react-sdk/lib/Modal');

 var notifications = require('../../../notifications');

-// TODO: this "view" component still has far to much application logic in it,
+// TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.

 // TODO: this component also does a lot of direct poking into this.state, which