Michael Shilman 70825cb2dc resolve conflicts merging master into release/3.3

2017-10-02 20:20:10 +02:00

..

travis

ADD docs scripts

2017-05-26 14:02:54 +02:00

bootstrap.js

Use yarn workspaces on master

2017-09-29 23:00:47 +03:00

build-pack.sh

Use a pack -> install technique to recreate local packages

2017-06-22 12:18:16 +10:00

clean-merged-branches.sh

Fix master detection

2017-09-24 13:56:27 +03:00

jest.init.js

UPGRADE react & friends && UPGRADE other dependencies

2017-09-29 23:36:38 +02:00

logo.js

Improved colourmap visibility

2017-07-21 10:48:12 +02:00

prepare.js

Fix/suppress current eslint warnings.

2017-10-02 01:40:46 +03:00

test.js

Merge release/3.3

2017-09-08 01:44:20 +03:00