Skip to content

Commit

Permalink
Merge branch 'v1.2.3'
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
vwolfley committed Jul 28, 2020
2 parents 1f0222c + 91e41f2 commit 08b6178
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
35 changes: 31 additions & 4 deletions package-lock.json

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

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Peoria-Business-Resources-Tool",
"version": "1.2.2",
"version": "1.2.3",
"date": "2020-07-28",
"copyright": "2020",
"description": "MAG webmap for City of Peoria Businesses",
Expand Down Expand Up @@ -35,6 +35,7 @@
],
"private": true,
"dependencies": {
"@popperjs/core": "^2.4.4",
"arcgis-js-api": "^4.16.2",
"bootstrap": "^4.5.0",
"grunt-cli": "^1.3.2",
Expand All @@ -43,6 +44,7 @@
"devDependencies": {
"@babel/core": "^7.10.5",
"@babel/preset-env": "^7.10.4",
"dijit": ">=1.14.7",
"grunt": "^1.2.1",
"grunt-babel": "^8.0.0",
"grunt-comment-toggler": "^0.2.2",
Expand All @@ -61,7 +63,7 @@
"jshint-stylish": "^2.2.1",
"jshint-stylish-ex": "^0.2.0",
"load-grunt-tasks": "^5.1.0",
"lodash": "^4.17.19",
"lodash": ">=4.17.19",
"matchdep": "^2.0.0",
"node-sass": "^4.14.1",
"normalize.css": "^8.0.1",
Expand Down

0 comments on commit 08b6178

Please sign in to comment.