Merge branch '4.0' into api_syncing

This commit is contained in:
Dan Stillman 2015-04-13 02:01:14 -04:00
commit fec43f1f62
157 changed files with 1539 additions and 686 deletions

View file

@ -12,7 +12,7 @@
<RDF:Description>
<id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
<minVersion>31.0</minVersion>
<maxVersion>36.*</maxVersion>
<maxVersion>37.*</maxVersion>
<updateLink>http://download.zotero.org/extension/zotero.xpi</updateLink>
<updateHash>sha1:</updateHash>
</RDF:Description>