www

commit b4142342a507947e605b387da3ede01e4a3db1d6
parent 532c95e13ea67635fa29345685e3b0f4b70922e3
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 14 Mar 2015 18:32:54 -0400

Merge remote-tracking branch 'origin/connector' into 4.0

Diffstat:
M
chrome/content/zotero/xpcom/connector/cachedTypes.js
 | 
2
+-
M
install.rdf
 | 
2
+-
M
resource/config.js
 | 
2
+-
M
update.rdf
 | 
2
+-

4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/connector/cachedTypes.js b/chrome/content/zotero/xpcom/connector/cachedTypes.js
@@ -87,7 +87,7 @@ Zotero.Connector_Types = new function() {
 				} else if(Zotero.isChrome) {
 					return chrome.extension.getURL("images/"+icon);
 				} else if(Zotero.isSafari) {
-					return safari.extension.baseURI+"images/itemTypes/"+icon;
+					return safari.extension.baseURI+"images/"+icon;
 				}
 			};
 		}
diff --git a/install.rdf b/install.rdf
@@ -6,7 +6,7 @@
   
     <em:id>zotero@chnm.gmu.edu</em:id>
     <em:name>Zotero</em:name>
-    <em:version>4.0.26.SOURCE</em:version>
+    <em:version>4.0.26.1.SOURCE</em:version>
     <em:creator>Center for History and New Media<br/>George Mason University</em:creator>
     <em:contributor>Dan Cohen</em:contributor>
     <em:contributor>Sean Takats</em:contributor>
diff --git a/resource/config.js b/resource/config.js
@@ -14,7 +14,7 @@ var ZOTERO_CONFIG = {
 	BOOKMARKLET_ORIGIN: 'https://www.zotero.org',
 	HTTP_BOOKMARKLET_ORIGIN: 'http://www.zotero.org',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
-	VERSION: '4.0.26.SOURCE'
+	VERSION: '4.0.26.1.SOURCE'
 };
 
 EXPORTED_SYMBOLS = ["ZOTERO_CONFIG"];
diff --git a/update.rdf b/update.rdf
@@ -7,7 +7,7 @@
     <RDF:Seq>
       <RDF:li>
         <RDF:Description>
-          <version>4.0.26.SOURCE</version>
+          <version>4.0.26.1.SOURCE</version>
           <targetApplication>
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>