0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-15 01:52:45 +00:00

Merge branch 'master' into migration-guide

# Conflicts:
#	server.js
This commit is contained in:
Charlie Humphreys
2022-01-26 08:44:28 -06:00
33 changed files with 7580 additions and 1531 deletions

View File

@@ -24,6 +24,7 @@ const HelpNavItem = require('../../navbar/help.navitem.jsx');
const UserPage = createClass({
displayName : 'UserPage',
getDefaultProps : function() {
return {
username : '',