Skip to content

Commit

Permalink
Merge branch 'jurism-5.0' of github.com:Juris-M/zotero into jurism-5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fbennett committed Apr 18, 2017
2 parents 1e905e2 + 70df696 commit 2c6c4d2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .gitmodules
@@ -1,9 +1,9 @@
[submodule "translators"]
path = translators
url = git@github.com:juris-m/translators.git
url = https://github.com/Juris-M/translators.git
[submodule "styles"]
path = styles
url = git@github.com:juris-m/jm-styles.git
url = https://github.com/Juris-M/jm-styles.git
[submodule "test/resource/chai"]
path = test/resource/chai
url = https://github.com/chaijs/chai.git
Expand All @@ -12,10 +12,10 @@
url = https://github.com/mochajs/mocha.git
[submodule "csl-locale-submodule"]
path = chrome/content/zotero/locale/csl
url = git@github.com:citation-style-language/locales.git
url = https://github.com/citation-style-language/locales.git
[submodule "jm-sh"]
path = jm-sh
url = git@github.com:Juris-M/jm-sh.git
url = https://github.com/Juris-M/jm-sh.git
[submodule "test/resource/chai-as-promised"]
path = test/resource/chai-as-promised
url = https://github.com/domenic/chai-as-promised.git
2 changes: 1 addition & 1 deletion chrome/content/zotero/locale/csl
Submodule csl updated 2 files
+7 −7 locales-nl-NL.xml
+11 −11 locales-sl-SI.xml
1 change: 1 addition & 0 deletions jm-sh
Submodule jm-sh added at 96a305

0 comments on commit 2c6c4d2

Please sign in to comment.