search

net-art-uchicago / cta-file-sharing

a collaborative artware project by Media Art and Design students at the University of Chicago.
GNU General Public License v3.0
2 stars 15 forks source link

resovling conflicts from Shayna's PR #32

Closed nbriz closed 1 year ago

nbriz commented 1 year ago

@shayna-k resolving merge conflicts from ur PR in this PR