Merge branch 'develop' into experimental

2018-10-31 14:54:22 +01:00
parent 33925b2fd1 33e2fc28b7
commit ba83166661
80 changed files with 760 additions and 263 deletions
@@ -48,7 +48,7 @@ export default class GroupInviteTileContextMenu extends React.Component {
        Modal.createTrackedDialog('Reject community invite', '', QuestionDialog, {
            title: _t('Reject invitation'),
            description: _t('Are you sure you want to reject the invitation?'),
-            onFinished: async (shouldLeave) => {
+            onFinished: async(shouldLeave) => {
                if (!shouldLeave) return;

                // FIXME: controller shouldn't be loading a view :(