summaryrefslogtreecommitdiff
path: root/site/content/pages/about/credits.md
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2019-03-14 02:50:24 +0100
committerJules Laplace <julescarbon@gmail.com>2019-03-14 02:50:24 +0100
commitc826165945096a90902bb7a31db72eb0670ab388 (patch)
tree7d4fd76f427468b8be3148c6b8fe4c70ec1d718a /site/content/pages/about/credits.md
parent8df493f6f9d18acfe5919cf257c2da0d2b30ab7a (diff)
parent26646e6adf3833f6282e9515c14ad61e485440c0 (diff)
rebuild and add compare-csv-counts.py script
Diffstat (limited to 'site/content/pages/about/credits.md')
-rw-r--r--site/content/pages/about/credits.md11
1 files changed, 8 insertions, 3 deletions
diff --git a/site/content/pages/about/credits.md b/site/content/pages/about/credits.md
index 04ecdf9c..bc2283fd 100644
--- a/site/content/pages/about/credits.md
+++ b/site/content/pages/about/credits.md
@@ -27,15 +27,20 @@ authors: Adam Harvey
#### Team
-- Research, concept: Adam Harvey
-- Site development, visualizations: Jules LaPlace
-- Assistant researcher: Berit Gilma
+- Research and image analysis: Adam Harvey
+- Development and visualizations: Jules LaPlace
- Produced in Partnership with Mozilla
+- Contributing researchers: Berit Gilma, Mathana Stender
#### 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