Simon Kornblith 96305492f7 Remove "About File Syncing" link from preferences (originally removed by 758216638f, accidentally reinstated by 4e5d4281f1)		2012-06-26 20:54:04 -04:00
..
content	Remove "About File Syncing" link from preferences (originally removed by 758216638f, accidentally reinstated by 4e5d4281f1)	2012-06-26 20:54:04 -04:00
locale	Merge branch 'no-new-collection-on-import'	2012-06-10 22:39:41 -04:00
skin/default/zotero	Merge branch 'attachment-progress'	2012-06-10 21:56:15 -04:00