diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2019-03-10 18:55:54 +0100 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2019-03-10 18:55:54 +0100 |
| commit | 9ab044ca26dbda9672b31e54e2ca848a21b96ce3 (patch) | |
| tree | c6a31f17d20f771c0b89a13b7e0cdd32bfbc86de /site/templates | |
| parent | 0868068cda92a933d542090a3085cf4ff8944e1c (diff) | |
| parent | ae7a45794ef3a6c72cf24b3223e8fd37c8fb22d9 (diff) | |
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'site/templates')
| -rw-r--r-- | site/templates/home.html | 2 | ||||
| -rw-r--r-- | site/templates/layout.html | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/site/templates/home.html b/site/templates/home.html index cb357e3f..62f78978 100644 --- a/site/templates/home.html +++ b/site/templates/home.html @@ -28,7 +28,7 @@ </div> <footer> <div> - MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets + MegaPixels is an art and research project by Adam Harvey about the origins and ethics of facial analysis datasets, developed in partnership with Mozilla. </div> <div> MegaPixels ©2017-19 Adam R. Harvey / diff --git a/site/templates/layout.html b/site/templates/layout.html index 860d1283..b5b7880c 100644 --- a/site/templates/layout.html +++ b/site/templates/layout.html @@ -21,7 +21,6 @@ </a> <div class='links'> <a href="/datasets/">Datasets</a> - <a href="/research/">Research</a> <a href="/about/">About</a> </div> </header> |
