Merge branch 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian

* 'master' of git://git.debian.org/git/pkg-exppsy/neurodebian:
  Draft of a 'popularity' button.

diff --git a/sphinx/coffeeart.rst b/sphinx/coffeeart.rst
index 03bcc2ba69a037b80e533a7fe9652499e00538d9..e64b075befefa786f7f8ab7a13930c10871f2da1 100644 (file)
--- a/sphinx/coffeeart.rst
+++ b/sphinx/coffeeart.rst
@@ -8,7 +8,12 @@
 Coffee Art
 **********
 
-2011-09-01 18.48.53
+2011-12-30 12:28:37
+-------------------
+
+.. figure:: /pics/coffeeart/2011-12-30.jpg
+
+2011-09-01 18:48:53
 -------------------
 
 .. figure:: /pics/coffeeart/2011-09-01_18.48.53.jpg

diff --git a/sphinx/pics/coffeeart/2011-12-30.jpg b/sphinx/pics/coffeeart/2011-12-30.jpg
new file mode 100644 (file)
index 0000000..75e782c
Binary files /dev/null and b/sphinx/pics/coffeeart/2011-12-30.jpg differ