Skip to content

Commit

Permalink
Merge branch 'master' into issue/1122-cl-widget-installer
Browse files Browse the repository at this point in the history
  • Loading branch information
clpetersonucf authored May 31, 2018
2 parents 220fa00 + a0bb3ba commit 02c17bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"copy-webpack-plugin": "^4.0.1",
"hash-assets-webpack-plugin": "^0.3.2",
"materia-client-assets": "https://github.com/ucfcdl/materia-client-assets.git#v0.3.3",
"materia-client-assets": "https://github.com/ucfcdl/materia-client-assets.git#v0.3.4",
"napa": "^3.0.0"
},
"napa": {
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4412,9 +4412,9 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"

"materia-client-assets@https://github.com/ucfcdl/materia-client-assets.git#v0.3.3":
version "0.3.2"
resolved "https://github.com/ucfcdl/materia-client-assets.git#4b019be67eb2ddaf1dc0b9e1ae8cd994a9dd6583"
"materia-client-assets@https://github.com/ucfcdl/materia-client-assets.git#v0.3.4":
version "0.3.3"
resolved "https://github.com/ucfcdl/materia-client-assets.git#fe328320e08b100c6868f9ee33c4701a3ce59747"
dependencies:
angular "1.6.9"
angular-mocks "1.6.9"
Expand Down

0 comments on commit 02c17bd

Please sign in to comment.