0505ab6bb2
Conflicts: app/classes/Framadate/Utils.php |
||
---|---|---|
.. | ||
comments.tpl | ||
poll_hint_admin.tpl | ||
poll_hint.tpl | ||
poll_info.tpl | ||
vote_table_classic.tpl | ||
vote_table_date.tpl |
0505ab6bb2
Conflicts: app/classes/Framadate/Utils.php |
||
---|---|---|
.. | ||
comments.tpl | ||
poll_hint_admin.tpl | ||
poll_hint.tpl | ||
poll_info.tpl | ||
vote_table_classic.tpl | ||
vote_table_date.tpl |