Ryan VanderMeulen 834e51bc80 Merge fx-team to m-c. a=merge ... --HG-- extra : amend_source : 35bb2e9e2b827884507d4fcf12c69150baa3c4b3		2014-08-08 16:17:12 -04:00
..
client.js	Bug 1033988 Remove workaround for old-style parameter when getting a call url from the Loop server. r=nperriault	2014-07-29 17:17:40 +01:00
conversation.js	Bug 1048785 Part 2: Extend MozLoopAPI with channel, version and OS details. r=mikedeboer	2014-08-08 18:10:54 +01:00
conversation.jsx	Bug 1048785 Part 2: Extend MozLoopAPI with channel, version and OS details. r=mikedeboer	2014-08-08 18:10:54 +01:00
desktopRouter.js	Bug 1033841: Ported Loop panel views to React. r=Standard8	2014-07-04 17:08:55 +01:00
panel.js	Bug 1050263: Remove incorrect name reference from email subject when emailing a loop url r=dhenein,arcadio	2014-08-07 22:36:23 -04:00
panel.jsx	Bug 1050263: Remove incorrect name reference from email subject when emailing a loop url r=dhenein,arcadio	2014-08-07 22:36:23 -04:00