diff options
| author | adamhrv <adam@ahprojects.com> | 2019-03-14 15:09:44 +0100 |
|---|---|---|
| committer | adamhrv <adam@ahprojects.com> | 2019-03-14 15:09:44 +0100 |
| commit | df6db850a37d1a14a852b7932bef0c6bc5a2d27c (patch) | |
| tree | 0a85d6674598c936b20502a31fcb0c6ce2f82b86 /site/public/about/credits | |
| parent | f1ceb3953fae55a06c94a058f90ed278cf0240f5 (diff) | |
| parent | c826165945096a90902bb7a31db72eb0670ab388 (diff) | |
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'site/public/about/credits')
| -rw-r--r-- | site/public/about/credits/index.html | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/site/public/about/credits/index.html b/site/public/about/credits/index.html index b73ad927..b4c17c4d 100644 --- a/site/public/about/credits/index.html +++ b/site/public/about/credits/index.html @@ -44,9 +44,21 @@ <li>Contributing researchers: Berit Gilma, Mathana Stender</li> </ul> <h4>Code</h4> +<p><<<<<<< HEAD</p> <ul> +<li>This site uses D3.js, C3.js, and ThreeJS for visualizations.</li> +<li><h1>Data aggregation uses Pandas and PDFMiner.Six.</h1> +</li> <li>This site uses D3 and C2 for visuzations</li> -<li>Add more here</li> +<li>Add more here<blockquote><blockquote><blockquote><blockquote><blockquote><blockquote><blockquote><p>> 26646e6adf3833f6282e9515c14ad61e485440c0</p> +</blockquote> +</blockquote> +</blockquote> +</blockquote> +</blockquote> +</blockquote> +</blockquote> +</li> </ul> <h4>Data</h4> <ul> |