Merge branch 'master' of github.com:/nextcloud/mail into webpack_prod_config

Makefile

@@ -38,7 +38,7 @@ install-npm-deps-dev:
 optimize-js: install-npm-deps
 	./node_modules/webpack/bin/webpack.js --config js/webpack.prod.config.js
 
-dev-setup: install-composer-deps install-npm-deps-dev
+dev-setup: install-composer-deps-dev install-npm-deps-dev
 
 start-imap-docker:
 	docker pull $(docker_image)

js/replybuilder.js

@@ -82,8 +82,6 @@ define(function(require) {
 			cc = messageBody.get('cc');
 		}
 
-		console.error(recipientType, replyingAddress, to, cc);
-
 		return {
 			to: to,
 			from: [replyingAddress],