Dan Stillman 7d8a1b2573 Make Zotero.DataObject#fromJSON() synchronous ... When called on an identified object (i.e., one with an id or library/key), loadAllData() must be called first. When called on a new object (which is more common anyway), fromJSON() can be called immediately.		2015-10-29 01:19:14 -04:00
..
content	Make Zotero.DataObject#fromJSON() synchronous	2015-10-29 01:19:14 -04:00
locale	Add Feed and FeedItem	2015-09-21 17:08:21 -05:00
skin/default/zotero	Update conflict resolution for API syncing	2015-08-06 04:14:49 -04:00