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 with c26dec204590b851bb9f427c75453313ee32ae22 V00.30
authorYves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
Wed, 06 Apr 2011 17:38:39 +0200
changeset 103 1ea5f985e9f0
parent 101 263ea20d9bfd (current diff)
parent 102 ca1822004e89 (diff)
child 104 c1b207f9623e
Merge with c26dec204590b851bb9f427c75453313ee32ae22
script/lib/iri_tweet/models.pyc file | annotate | diff | comparison | revisions
script/lib/iri_tweet/utils.pyc file | annotate | diff | comparison | revisions
web/custom.css file | annotate | diff | comparison | revisions
web/index.php file | annotate | diff | comparison | revisions
web/res/css/custom.css file | annotate | diff | comparison | revisions 
--- a/web/index.php	Wed Apr 06 17:28:51 2011 +0200
+++ b/web/index.php	Wed Apr 06 17:38:39 2011 +0200
@@ -205,7 +205,7 @@
 				<div class="AVBtitle">ENMI 2010</div>
 				<div class="AVBtext">
 					par <a href="http://www.iri.centrepompidou.fr">IRI</a> au Centre Pompidou
-					<br/>le lundi 31 janvier · 08:30 - 10:30
+					<br/>les 14 et 15 décembre 2010 |· 08:30 - 10:30
 				</div>
 			</div>
 			<!-- -->
@@ -216,7 +216,7 @@
 				<div class="AVBtitle">Clay Shirky le net, le surplus cognitif</div>
 				<div class="AVBtext">
 					par <a href="http://www.rslnmag.fr/">RSLN</a> à Micorsoft France
-					<br/>le lundi 31 janvier · 08:30 - 10:30
+					<br/>le lundi 31 janvier 2011·| 08:30 - 10:30
 				</div>
 			</div>
 			<!-- -->
@@ -227,7 +227,7 @@
 				<div class="AVBtitle">OPENDATA</div>
 				<div class="AVBtext">
 					par <a href="http://www.rslnmag.fr/">RSLN</a> à Micorsoft France
-					<br/>le lundi 31 janvier · 08:30 - 10:30
+					<br/>le jeudi 17 mars 2011 | 14:30 - 17:15
 				</div>
 			</div>
tweet_live