# Conflicts:
#	src/components/index.ts
#	src/components/page-tile/demo.tsx
#	src/components/page-tile/index.tsx
#	src/components/view-switch/index.tsx
#	src/container/chrome/chrome-container.tsx
#	src/container/page-list/page-tile-container.tsx

:

;

* master: (132 commits)
  fix: ensure component registry is in sync
  fix: keep builtin library ids stable
  chore: update lockfile
  chore: enable hmr for more entries
  feat: disable button when library may not be edited
  chore: enable hmr for more changes
  chore: move to optional builtin hot reloader
  chore: allow reloading via cli
  chore: enable hmr for renderer
  fix: restore functionality after rebase
  perf: avoid transferring libs multiple times
  fix: avoid errors for missing onStoreCreate
  feat: change text input to autsized textarea
  fix: propagate hasFocusedInput correctly
  fix: prevent message feedback while highlight matcher is running
  style: remove stray console.log
  fix: ensure proper ser/de of pattern data
  chore: get rid of console junk via run-electron
  fix: compute currentPage store property reference correctly
  fix: clone user store references if required
  ...

# Conflicts:
#	src/container/editable-title/editable-title-container.tsx
#	src/container/element-list/element-container.tsx
#	src/container/element-list/element-list.tsx
#	src/container/page-list/page-list-container.tsx
#	src/model/page/page.ts
#	src/store/view-store.ts

* master:
  chore: update webpack and friends
  docs: restructure for overview
  docs(docs): include architecture diagram (#597)

…esIndex

;