Merge branch 'staging' into ooPassword

2019-11-25 16:51:06 +01:00
parent 0dc0df8aa1 12f6e3b1d4
commit c414bf1d5c
78 changed files with 1459 additions and 304 deletions
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -575,7 +575,8 @@ define([
                    support: Util.find(store.proxy, ['mailboxes', 'support', 'channel']),
                    pendingFriends: store.proxy.friends_pending || {},
                    supportPrivateKey: Util.find(store.proxy, ['mailboxes', 'supportadmin', 'keys', 'curvePrivate']),
-                    teams: teams
+                    teams: teams,
+                    plan: account.plan
                }
            };
            cb(JSON.parse(JSON.stringify(metadata)));