Squash merge https://github.com/vector-im/riot-web/pull/3636

2017-05-23 14:12:53 +01:00
parent 7d59742a22
commit 6b6fa59f3e
36 changed files with 7547 additions and 186 deletions
@@ -18,6 +18,7 @@ limitations under the License.

 var StandardActions = require('./StandardActions');
 var PushRuleVectorState = require('./PushRuleVectorState');
+import _t from 'counterpart-riot';

 class VectorPushRuleDefinition {
    constructor(opts) {