Add LifeStyle + Interest Page (Close #56) #101

Merged
b72zhou merged 17 commits from b72zhou-life-and-interest-page into main 2022-12-07 21:12:35 -05:00

17 Commits

Author SHA1 Message Date
e26chiu f8ef8fc6d7 Merge branch 'b72zhou-life-and-interest-page' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile into b72zhou-life-and-interest-page
continuous-integration/drone/push Build is passing Details
2022-12-06 22:33:25 -05:00
e26chiu d759766a6d Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile into b72zhou-life-and-interest-page 2022-12-06 22:31:59 -05:00
Mark Chiu 8a9f6b1647 Merge branch 'main' into b72zhou-life-and-interest-page
continuous-integration/drone/push Build is failing Details
2022-12-06 22:31:37 -05:00
e26chiu 566f3473bb Edit blurbs + Change minor data formatting
continuous-integration/drone/push Build is failing Details
2022-12-06 22:27:12 -05:00
Rebecca-Chou 3fb136fd1a :feat: add lifestyle-and-interest page
continuous-integration/drone/push Build is passing Details
2022-12-02 16:06:33 -05:00
Rebecca-Chou 3debf0b7e9 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-12-02 13:04:35 -05:00
Rebecca-Chou f3abc3882e Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-11-30 21:24:27 -05:00
Rebecca-Chou 02eafe44d3 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-11-23 13:31:25 -04:00
Rebecca-Chou f5c9f2e447 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-11-08 09:26:15 -04:00
Rebecca-Chou 9f6b2c80a0 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-10-19 12:40:17 -04:00
Rebecca-Chou ed31c4f1fc merge 2022-10-02 15:05:30 -04:00
Rebecca-Chou ad6436be2a merge main 2022-10-02 14:54:07 -04:00
Rebecca-Chou eebe20bfc6 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-09-14 15:49:57 -04:00
Rebecca-Chou 3bde1f4032 Merge branch 'main' of https://git.csclub.uwaterloo.ca/www/cs-2022-class-profile 2022-09-11 21:58:53 -04:00
Rebecca-Chou 5bee5a98c4 resolve conflict 2022-09-06 13:41:56 -04:00
Rebecca-Chou 5a0459f2db resolve conflict 2022-09-03 01:34:14 -04:00
Rebecca-Chou fc939fbec3 version 1 with lines shown 2022-08-31 23:25:39 -04:00