Skip to content

Commit 7d00e2d

Browse files
authored
Merge branch 'develop' into #1457-JackMitchellCredits
2 parents 4f26c10 + b8b422c commit 7d00e2d

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ const CreditsPage: React.FC = () => {
3939
{ name: 'Zack Roth', color: '#4a6741', sx: { px: 1, backgroundColor: '#E8D8CC', borderRadius: 2 } },
4040
{ name: 'Megan Liu', color: '#3d609e' },
4141
{ name: 'Peyton McKee', color: '#6a3941' },
42+
{ name: 'Tucker Gwertzman', color: '#25e6e2' },
4243
{ name: 'Ryan Howe', color: '#3cce20' },
4344
{ name: 'Ethan Szeto', color: '#404040' },
4445
{ name: 'Adarsh Jayaram', color: '#ff0000' },
@@ -114,6 +115,7 @@ const CreditsPage: React.FC = () => {
114115
{ name: 'Benjamin Zhu', color: '#ccccff' },
115116
{ name: 'Stephanie Xu', color: '#ffcd42' },
116117
{ name: 'Hareg Aderie', color: '#34b46c' },
118+
{ name: 'Motto Sereeyothin', color: '#000000' },
117119
{ name: 'Raymond Tsai', color: '#66cdaa' },
118120
{ name: 'Arinjay Singh', color: '#7bb5dc' },
119121
{ name: 'Aarav Shyamkumar', color: '#FF0000' },
@@ -130,10 +132,14 @@ const CreditsPage: React.FC = () => {
130132
}
131133
},
132134
{ name: 'Kevin Polackal', color: '#800080' },
135+
{ name: 'Sindhu Balamurugan', color: '#c170fa' },
133136
{ name: 'Lily Shiomitsu', color: '#008080' },
134137
{ name: 'Kevin Yang', color: '#0000FF' },
138+
{ name: 'Jack Mitchell', color: '808000' },
139+
{ name: 'Neel Raut', color: '#023665' },
135140
{ name: 'Qihong Wu', color: '#87CEEB' },
136-
{ name: 'Jack Mitchell', color: '808000' }
141+
{ name: 'Megan Lai', color: '#52B2BF' },
142+
{ name: 'Eric Sun', color: '#FCCAED' }
137143
];
138144

139145
const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];

0 commit comments

Comments
 (0)