Dan Stillman b919143630 Skip conflict resolution for remote objects that can't be saved ... E.g., if a local item has been modified in a way that conflicts with a remote item that also has a new, unknown field, don't show the CR window -- just add the item to the sync queue and show the some-data-could-not-be-downloaded error.		2021-02-07 16:49:01 -05:00
..
content	Skip conflict resolution for remote objects that can't be saved	2021-02-07 16:49:01 -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