f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-10 20:03:03 +00:00
Code Wiki Activity

Merge branch 'master' into migration-guide

Browse Source 
# Conflicts:
#	server.js
This commit is contained in:
Charlie Humphreys
2022-01-26 08:44:28 -06:00
parent 9432304be5 179d5e6312
commit 7f001ee391
33 changed files with 7580 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/homebrew/pages/userPage/brewItem/brewItem.jsx
View File

@@ -10,6 +10,7 @@ const googleDriveIcon = require('../../../googleDrive.png');
const dedent = require('dedent-tabs').default;
const BrewItem = createClass({
displayName : 'BrewItem',
getDefaultProps : function() {
return {
brew : {

1
client/homebrew/pages/userPage/userPage.jsx
View File

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