scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-28 01:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
zotero/chrome
History
Dan Stillman 57116fa892 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/collectionTreeView.js
	chrome/content/zotero/xpcom/libraryTreeView.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
2014-05-08 15:52:31 -04:00
..
content Merge branch '4.0' 2014-05-08 15:52:31 -04:00
locale Merge new English strings 2014-05-07 05:16:24 -04:00
skin/default/zotero Configurable secondary sorting and other improvements 2014-05-07 05:15:07 -04:00