Dan Stillman 788f92bc8b Fix sync error panel positioning (at least on OS X) ... After 88be88661		2015-04-03 23:54:37 -04:00
..
content	Fix sync error panel positioning (at least on OS X)	2015-04-03 23:54:37 -04:00
locale	Merge locales from Transifex	2015-03-26 20:34:23 -04:00
skin/default/zotero	Add checkbox to use one side for all remaining conflicts	2015-03-26 20:34:23 -04:00