Resolve merge conflicts
This commit is contained in:
commit
74b73c69f9
3 changed files with 64 additions and 29 deletions
|
|
@ -10,7 +10,7 @@
|
|||
- New `utils.format_grid` for easily displaying long lists of items in a block.
|
||||
- Using `lunr` search indexing for better `help` matching and suggestions. Also improve
|
||||
the main help command's default listing output.
|
||||
|
||||
- Added `content_types` indexing to DefaultObject's ContentsHandler. (volund)
|
||||
|
||||
### Already in master
|
||||
- `is_typeclass(obj (Object), exact (bool))` now defaults to exact=False
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue