Merge branch '4.0'

This commit is contained in:
Dan Stillman 2016-10-12 19:29:32 -04:00
commit 51a3687123
4 changed files with 28 additions and 13 deletions

View file

@ -18,6 +18,7 @@
<em:aboutURL>chrome://zotero/content/about.xul</em:aboutURL>
<em:iconURL>chrome://zotero/skin/zotero-new-z-48px.png</em:iconURL>
<em:updateURL>https://www.zotero.org/download/update-source.rdf</em:updateURL>
<em:multiprocessCompatible>false</em:multiprocessCompatible>
<em:type>2</em:type> <!-- type=extension -->
<!-- Firefox -->