Merge branch 'master' into migration-guide

# Conflicts:
#	server.js
This commit is contained in:
Charlie Humphreys committed 2022-01-26 08:44:28 -06:00
commit 7f001ee391
33 files changed
+7580 -1531

No files matched your search

@@ -21,6 +21,7 @@ const BrewRenderer = require('../../brewRenderer/brewRenderer.jsx');
const HomePage = createClass({
displayName : 'HomePage',
getDefaultProps : function() {
return {
brew : {