52 Commits

Author SHA1 Message Date
Norbert de Langen
06dbef4c3c
Merge branch 'next' into tech/overhaul-ui
# Conflicts:
#	.babelrc
#	addons/actions/package.json
#	addons/backgrounds/package.json
#	addons/notes/package.json
#	lib/addons/package.json
#	lib/channel-websocket/package.json
#	lib/core/src/server/config/babel.dev.js
#	lib/ui/package.json
2018-11-14 17:39:20 +01:00
Norbert de Langen
31e46a3180
FIX the babel6 test 2018-11-09 11:43:12 +01:00