Olivier PEREZ 4fa4ee0acc Merge branch 'master' into develop ... Conflicts: admin/migration.php		2015-10-12 23:46:02 +02:00
..
comments.tpl	Display the comment timestamp	2015-10-12 23:14:21 +02:00
poll_hint_admin.tpl	Fix missing keys	2015-04-07 20:06:24 +02:00
poll_hint.tpl	Fix missing keys	2015-04-07 20:06:24 +02:00
poll_info.tpl	Fix for PHP5.4	2015-04-15 13:23:19 +02:00
vote_table_classic.tpl	Don't skip the last column on charts	2015-06-23 21:54:39 +02:00
vote_table_date.tpl	Fix deletion when slot label contains html specific characters	2015-10-05 23:51:29 +02:00