kareenf 936d3ffc98 Delete merch page [fixes #12039] (#12094) ...

* delete merch.vue and all mentions of links to merch page

* Added comments about why merch page is being deleted

Co-authored-by: Kareen <kareenf@umich.edu>

2020-04-17 22:55:22 +02:00

..

client

Delete merch page [fixes #12039] (#12094)

2020-04-17 22:55:22 +02:00

common

Merge branch 'release' into develop

2020-04-17 14:25:58 -05:00

raw_sprites

feat(content): enable spring avatar customizations

2020-04-14 14:49:11 -05:00

server

Don't link user in markdown code blocks - Fixes #[11504] (#12069)

2020-04-17 22:19:11 +02:00