Kit Cambridge d2833635e1 Bug 1352233 - Try to preserve synced folder child order in case of conflicts. r=tcsc ...

For folders, we resolve conflicts by taking the chronologically newer
list, then appending any missing items from the older list. This
preserves the order of those missing items relative to each other, but
not relative to those appearing in the newer list.

MozReview-Commit-ID: 6rimXpV7vLg

--HG--
extra : rebase_source : 10cda7f529cec3f71d9d45d253285d35788cb0b5

2017-04-28 14:08:11 -07:00

..

blocklists

Bug 1345556 - adjust BUG_COMPONENT for services/blocklist/* files. r=leplatrem

2017-03-10 12:26:58 -05:00

common

Bug 1357116 - Load the blocklist updater module lazily r=florian,mgoodwin

2017-04-20 10:35:04 +02:00

crypto

Bug 1359540 - Enable the Mozilla ESlint recommended rules for services/. r=markh

2017-04-27 17:24:18 +01:00

fxaccounts

Bug 1353571 part 3 - Refactor browser-syncui and browser-fxaccounts. r=markh

2017-04-18 14:15:43 -04:00

sync

Bug 1352233 - Try to preserve synced folder child order in case of conflicts. r=tcsc

2017-04-28 14:08:11 -07:00

.eslintrc.js

Bug 1359011 - Make the mozilla/recommended eslint configuration the default for the whole tree. r=mossop

2017-04-25 20:12:21 +01:00

moz.build

Bug 1361171 - Remove CloudSync. r=markh

2017-05-01 14:43:00 -07:00