Skip to content

Commit d4f0455

Browse files
committed
Merge master into prod: resolve join.tsx conflict
2 parents 9686b24 + 566bbfe commit d4f0455

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

src/pages/join.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,8 @@ const TeamPage = (props: ITeamPage) => {
148148
<li>Mikołaj Rodkiewicz</li>
149149
<li>Hubert Skibiński</li>
150150
<li>Marcin Stepnowski</li>
151+
<li>Adam Stolarczyk</li>
152+
<li>Karol Stolarczyk</li>
151153
<li>Kacper Żebrowski</li>
152154
<li>Julia Sulich</li>
153155
<li>Mateusz Śląski</li>

0 commit comments

Comments
 (0)