# HG changeset patch # User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com> # Date 1317990052 -7200 # Node ID 87d2e09c578cf6ff5ef670b92534459bc718e33c # Parent 106c4ec894aa11e2a93a208c3f48a3d5258bb9df# Parent dfcc0e08f2951527fbb149aa988fbc1dae8220a1 Merge with ab3ea7cbd3317a69aef6c0343422380fa41a2456 diff -r 106c4ec894aa -r 87d2e09c578c web/polemicaltimeline.php --- a/web/polemicaltimeline.php Fri Oct 07 14:11:35 2011 +0200 +++ b/web/polemicaltimeline.php Fri Oct 07 14:20:52 2011 +0200 @@ -160,7 +160,7 @@