f/165476 resolved merge conflicts

Esri · Jan 25, 2021 · c351ae0 · c351ae0
2 parents 8d3ae98 + f4fe9f2
commit c351ae0
Show file tree

Hide file tree

Showing 41 changed files with 1,691 additions and 1,563 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [6.23.0] - January 22nd 2021
+
+- New Features
+  - **getContent**: now accepts an `IModel` object [4e9b21e](https://github.com/Esri/hub.js/commit/4e9b21ec831113859919d55da58496a0532939e9)
+
 ## [6.22.3] - January 21st 2021
 
 ### Other Changes

diff --git a/demos/oauth2-browser/package-lock.json b/demos/oauth2-browser/package-lock.json
diff --git a/demos/oauth2-browser/package.json b/demos/oauth2-browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@esri/hub-oauth-demo",
-  "version": "6.22.3",
+  "version": "6.23.0",
   "private": true,
   "description": "Hub.js browser demo",
   "author": "",

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
     "demos/*",
     "packages/*"
   ],
-  "version": "6.22.3"
+  "version": "6.23.0"
 }