Merge pull request #241 from cmu-delphi/main

tildechris · web-flow · commit aba81138ddb3 · 2021-02-03T12:30:44.000-05:00
chore: sync main-&gt;dev
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -2,7 +2,7 @@ image:
   file: ./devops/gitpod.dockerfile
 tasks:
   - init: npm install && RScript -e "blogdown::install_hugo()"
-  - command: "echo 'run: \"npm start\" or \"npm run start:blog\"'"
+  - command: 'echo ''run: "npm start" or "npm run start:blog"'''
 ports:
   - port: 1313
 vscode:
diff --git a/.prettierignore b/.prettierignore
@@ -29,6 +29,7 @@
 *.md
 *.jpeg
 *.ico
+*.bib
 /themes/delphi/layouts/partials/webp-image.html
 /themes/delphi/layouts/shortcodes/apireflink.html
 /themes/delphi/layouts/shortcodes/reflink.html
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "www-main",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "www-main",`
`3`		`- "version": "1.12.4",`
	`3`	`+ "version": "1.12.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@fortawesome/fontawesome-free": "^5.15.1",`