Dan Stillman 254695f4b3 Skip extra sync download after some conflicts ... If an upload fails with a 412, and then we download, and then we go to upload but there was nothing to upload (e.g., because the remote version was chosen or there was an error saving it), there's no reason to do a download again after that.		2021-02-07 16:38:14 -05:00
..
content	Skip extra sync download after some conflicts	2021-02-07 16:38:14 -05:00
locale	Update locales from Transifex and merge new English strings	2021-01-27 10:10:43 -05:00
skin/default	Merge pull request #1930 from fletcherhaz/ace-editor	2020-12-24 02:57:01 -05:00