Wes Kocher 78bcbd03fc Merge inbound to m-c		2014-03-14 22:20:25 -07:00
..
interfaces	Bug 938635 - Implement forceAuthentication for firefox accounts. Part 3: UI glue. r=fabrice	2014-02-19 11:47:11 +01:00
tests	Bug 983256 - Change the client generated expiration time in FxA assertions to be 'forever'. r=jedp	2014-03-14 14:50:19 -07:00
Credentials.jsm	Backed out changeset 79b198be3e50 (bug 943521) for xpcshell failures.	2014-02-07 17:55:12 -05:00
FxAccounts.jsm	Bug 983256 - Change the client generated expiration time in FxA assertions to be 'forever'. r=jedp	2014-03-14 14:50:19 -07:00
FxAccountsClient.jsm	Bug 981921 - Allow signin in FxAccountsClient to use '?keys=true'. r=ckarlof	2014-03-12 22:50:58 +01:00
FxAccountsCommon.js	Bug 983256 - Change the client generated expiration time in FxA assertions to be 'forever'. r=jedp	2014-03-14 14:50:19 -07:00
FxAccountsManager.jsm	Bug 978896 - FxA: watch() should get silent assertion if possible. r=ferjm	2014-03-11 17:49:26 -07:00
FxAccountsUtils.jsm	Bug 967120 - Clean up FxAccounts' public/internal API implementation r=markh	2014-02-04 11:12:37 +01:00
moz.build	Backed out changeset 79b198be3e50 (bug 943521) for xpcshell failures.	2014-02-07 17:55:12 -05:00