Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge V00.72
authorYves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
Mon, 18 Jul 2011 13:39:30 +0200
changeset 227 ffdfdf0b5d3c
parent 226 45f6a091ad92 (diff)
parent 221 f4e0ebfe513d (current diff)
child 228 1bcc79e78fa1
merge
web/common.php file | annotate | diff | comparison | revisions
web/sig-chi-paris-2011/polemicaltimeline.php file | annotate | diff | comparison | revisions 
--- a/web/common.php	Mon Jul 18 11:56:35 2011 +0200
+++ b/web/common.php	Mon Jul 18 13:39:30 2011 +0200
@@ -110,8 +110,7 @@
 		 |  <a href='http://www.lri.fr/' class='footerLink' target='_blank' > LRI  </a>
 		 |  <a href='http://www.inria.fr/' class='footerLink' target='_blank' > INRIA</a>
 	     |  <a href='http://www.cnrs.fr/telecom' class='footerLink' target='_blank' > CNRS</a>
-	     |  <a href='http://www.telecom-paristech.fr/' class='footerLink' target='_blank' > telecom paris tech</a>
-		 |  <a href='http://www.inflammableproductions.com/' class='footerLink' target='_blank'> Inflammable  </a>";
+	     |  <a href='http://www.telecom-paristech.fr/' class='footerLink' target='_blank' > telecom paris tech</a>";
 $C_islive = true;
tweet_live