Mirror of https://github.com/zotero/zotero.git

Dan Stillman 840790926b Fix merging of tags during sync conflict ... If an item was added to a tag on one computer and another item was added to the tag on a different computer, and then they both synced one of the tags could be removed on the second computer to sync.		2013-09-04 17:53:11 -04:00
chrome	Fix merging of tags during sync conflict	2013-09-04 17:53:11 -04:00
components	Return a promise from Zotero.shutdown()	2013-08-09 11:11:01 -04:00
defaults/preferences	Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero"	2013-07-31 23:19:19 -04:00
resource	Revert "Disable spellchecking in notes until it can be supported for real"	2013-08-09 11:44:34 -04:00
styles@01e0f42aee	Update version and styles	2013-08-08 15:24:47 -04:00
translators@330bcfa0ab	Update submodules, repotime, and versions	2013-08-06 15:23:04 -04:00
.gitmodules	Add https://github.com/zotero/bundled-styles as submodule	2011-11-03 00:34:34 -04:00
chrome.manifest	Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero"	2013-07-31 23:19:19 -04:00
COPYING	Switch client code license to Affero GPL version 3	2011-05-18 18:34:22 +00:00
install.rdf	Update versions	2013-08-09 11:50:10 -04:00
update.rdf	Update versions	2013-08-09 11:50:10 -04:00