Update version

Update version and submodules
Update version
2018-02-03 02:46:10 -05:00 · 2018-02-03 00:52:15 -05:00 · 2018-01-22 15:39:17 -05:00 · 2018-01-22 05:32:50 -05:00 · 2018-01-22 05:30:18 -05:00 · 2018-01-19 19:23:45 -05:00
6 changed files with 9 additions and 9 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -35,10 +35,10 @@ before_script:
    - sh -e /etc/init.d/xvfb start
    - npm i
    - npm run build
-    - if [ $FX_VERSION = "54.0" ] &&
+    - if [[ $FX_VERSION = "54.0" &&
-         [ $TRAVIS_REPO_SLUG = "zotero/zotero" ] &&
+            $TRAVIS_REPO_SLUG = "zotero/zotero" &&
-         [ $TRAVIS_BRANCH = "master" ] &&
+            ($TRAVIS_BRANCH = "master" || $TRAVIS_BRANCH = *-hotfix) &&
-         [ $TRAVIS_PULL_REQUEST = "false" ]; then
+            $TRAVIS_PULL_REQUEST = "false" ]]; then
        mkdir build-zip;
        cd build;
        zip -r ../build-zip/$TRAVIS_COMMIT.zip *;
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@ -1 +1 @@
-Subproject commit 684bad2035a563b0661c1eb17b0ee6ba6325e571
+Subproject commit 15396c0c18b768f0837015091bae9c931d4dd56b
--- 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>5.0.34.SOURCE</em:version>
+    <em:version>5.0.34.6.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>
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@ -1 +1 @@
-2018-01-07 23:00:00
+2018-02-01 13:45:00
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b605dc3869e157f91eedb3f1519cd020c00bdafb
+Subproject commit 190224fd811bf2f55342372aa3a79ad53df245c5
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 18f8d6a2f3d7727c2acfd42f021f0adbd2abd9df
+Subproject commit 66e7a146cadc9626af545179b5d1580a40a73d06
Author	SHA1	Message	Date
Dan Stillman	ea29c5cb10	Update version	2018-02-03 02:46:10 -05:00
Dan Stillman	12c9e55472	Update version and submodules	2018-02-03 00:52:15 -05:00
Dan Stillman	380ee9c0ed	Update version	2018-01-22 15:39:17 -05:00
Dan Stillman	4ed33b4da9	Run deploys from Travis on *-hotfix branches	2018-01-22 05:32:50 -05:00
Dan Stillman	ff9ee48e0f	Update version	2018-01-22 05:30:18 -05:00
Dan Stillman	e577009154	Update version	2018-01-19 19:23:45 -05:00
Dan Stillman	246d7af3eb	Force ZIP build on Travis	2018-01-19 13:45:25 -05:00
Dan Stillman	2edf2641a2	Update version	2018-01-19 13:34:23 -05:00
		`@ -1 +1 @@`
			`Subproject commit 684bad2035a563b0661c1eb17b0ee6ba6325e571`				`Subproject commit 15396c0c18b768f0837015091bae9c931d4dd56b`
		`@ -1 +1 @@`
			`Subproject commit b605dc3869e157f91eedb3f1519cd020c00bdafb`				`Subproject commit 190224fd811bf2f55342372aa3a79ad53df245c5`
		`@ -1 +1 @@`
			`Subproject commit 18f8d6a2f3d7727c2acfd42f021f0adbd2abd9df`				`Subproject commit 66e7a146cadc9626af545179b5d1580a40a73d06`