Skip to content

Commit

Permalink
Merge branch 'master' of github.com:payloadcms/payload
Browse files Browse the repository at this point in the history
  • Loading branch information
jmikrut committed Sep 30, 2021
2 parents f422053 + d498e37 commit 60ff7af
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 0 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
### Features

* adds rich text editor upload element ([aa76950](https://github.com/payloadcms/payload/commit/aa769500c934f4dee51a24c0cfc0297c12b5ae47))
* adds UploadGallery to rich text upload ([6f3edf9](https://github.com/payloadcms/payload/commit/6f3edf9fbb1c57a54e3aab30ea6378e7771f0b7d))
* progress to rich text upload ([85c6c30](https://github.com/payloadcms/payload/commit/85c6c303d5f872295351fc9452a1eab9fb4ad514))
* updates slate, finishes rte upload ([08db431](https://github.com/payloadcms/payload/commit/08db431c0c4626a0d10f4e1c7bca29fa075eedc6))

## [0.10.4](https://github.com/payloadcms/payload/compare/v0.10.0...v0.10.4) (2021-09-22)
Expand Down
1 change: 1 addition & 0 deletions src/config/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,5 @@ export default joi.object({
plugins: joi.array().items(
joi.func(),
),
debug: joi.boolean(),
});

0 comments on commit 60ff7af

Please sign in to comment.