diff options
Diffstat (limited to 'site/content')
| -rw-r--r-- | site/content/pages/about/credits.md | 5 | ||||
| -rw-r--r-- | site/content/pages/about/index.md | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md index d4021d44..bc2283fd 100644 --- a/site/content/pages/about/credits.md +++ b/site/content/pages/about/credits.md @@ -34,8 +34,13 @@ authors: Adam Harvey #### Code +<<<<<<< HEAD +- This site uses D3.js, C3.js, and ThreeJS for visualizations. +- Data aggregation uses Pandas and PDFMiner.Six. +======= - This site uses D3 and C2 for visuzations - Add more here +>>>>>>> 26646e6adf3833f6282e9515c14ad61e485440c0 #### Data diff --git a/site/content/pages/about/index.md b/site/content/pages/about/index.md index cf7d782b..3dd14bfe 100644 --- a/site/content/pages/about/index.md +++ b/site/content/pages/about/index.md @@ -40,7 +40,7 @@ The MegaPixels website is produced in partnership with [Mozilla](https://mozilla <h3>Adam Harvey</h3> <p>is Berlin-based American artist and researcher. His previous projects (CV Dazzle, Stealth Wear, and SkyLift) explore the potential for countersurveillance as artwork. He is the founder of VFRAME (visual forensics software for human rights groups), the recipient of 2 PrototypeFund grants, and is a researcher in residence at Karlsruhe HfG. <br> - ahprojects.com + <a href="https://ahprojects.com">ahprojects.com</a> </p> </div> <div class="team-member"> @@ -48,7 +48,7 @@ The MegaPixels website is produced in partnership with [Mozilla](https://mozilla <h3>Jules LaPlace</h3> <p>is an American creative technologist also based in Berlin. He was previously the CTO of a digital agency in NYC and now also works at VFRAME, developing computer vision for human rights groups. Jules also builds creative software for artists and musicians. <br> - https://asdf.us + <a href="https://asdf.us/">asdf.us</a> </p> </div> </div> |