Merge remote-tracking branch 'origin/master' into lens_restructure

Browse Source

# Conflicts:
#	package.json
#	src/main/index.ts
#	src/renderer/api/__test__/parseAPI.test.ts
#	src/renderer/components/chart/bar-chart.tsx
#	src/renderer/components/chart/chart.tsx
#	src/renderer/components/chart/pie-chart.tsx
#	src/renderer/utils/__tests__/arrays.test.ts
#	src/renderer/utils/arrays.ts
#	yarn.lock

...

This commit is contained in:

Roman committed 2020-06-22 17:09:07 +03:00

2 parents bfdd31f4e6 d55803d0c7

commit f4922811cc

38 files changed

+281 -265

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

build/icon.ico

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 100 KiB After Width:  |  Height:  |  Size: 116 KiB

build/icon.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.5 KiB After Width:  |  Height:  |  Size: 26 KiB

build/icons/512x512.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.5 KiB After Width:  |  Height:  |  Size: 26 KiB