Skip to content

Commit

Permalink
Merge branch 'dev/tup-cms' into task/core-styles-wysiwyg-css
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar authored Apr 5, 2023
2 parents 65c5350 + 6df6487 commit 889292c
Show file tree
Hide file tree
Showing 5 changed files with 150 additions and 107 deletions.
179 changes: 96 additions & 83 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"devDependencies": {
"@frctl/fractal": "^1.5.14",
"@frctl/mandelbrot": "^1.10.1",
"@tacc/core-styles": "github:TACC/Core-Styles#675e5d5",
"@tacc/core-styles": "^2.6.2",
"minimist": "^1.2.6"
},
"repository": "git@github.com:TACC/Core-CMS.git",
Expand Down
Loading

0 comments on commit 889292c

Please sign in to comment.