hiro
Fix merge conflicts
ac08645ce @ 2018-08-22 12:25:54
| .. | ||
|---|---|---|
| CookieManagers.png | Update TBB design doc with suggestions from Georg Koppen, pde, and Sid. | 2011-10-05 07:48:34 |
| NewCookieManager.png | Update design doc with FF17-ESR changes. | 2013-02-23 05:06:58 |
| index.html.en | Fix typo in design doc | 2018-06-15 17:42:13 |
