Dan Stillman 295e9f3ecf Don't retry cancelled conflicts immediately ... If other items were saved in the same batch, the conflict resolution window could reappear immediately after cancelling it.		2016-04-27 05:45:35 -04:00
..
components	Increase default test timeout to 10 seconds on Travis	2016-04-26 02:43:44 -04:00
content	Increase default test timeout to 10000	2016-04-26 21:46:05 -04:00
resource	Gzip-compress API uploads larger than 1000 characters	2016-03-28 02:38:28 -04:00
tests	Don't retry cancelled conflicts immediately	2016-04-27 05:45:35 -04:00
chrome.manifest	Unit testing infrastructure	2015-03-07 16:34:55 -05:00
install.rdf	Update maxVersion	2015-10-29 03:57:08 -04:00
runtests.sh	Increase default test timeout to 10 seconds on Travis	2016-04-26 02:43:44 -04:00