Skip to content

Commit

Permalink
Merge pull request #89 from Chicago/dev
Browse files Browse the repository at this point in the history
Moving code to master branch #88
  • Loading branch information
nicklucius committed Sep 6, 2018
2 parents ff14398 + 6bcfc92 commit 2ddcff1
Show file tree
Hide file tree
Showing 6 changed files with 48,494 additions and 116 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "clear-water"]
path = clear-water
url = git@github.com:Chicago/clear-water
branch = master
path = clear-water
url = https://github.com/Chicago/clear-water.git
branch = master
129 changes: 117 additions & 12 deletions bibliography/bibliography.bib

Large diffs are not rendered by default.

357 changes: 331 additions & 26 deletions bibliography/zotero-references.bib

Large diffs are not rendered by default.

0 comments on commit 2ddcff1

Please sign in to comment.