Merge branch 'develop' into 'master'

Version 1.1.1

See merge request framasoft/framadate!292
This commit is contained in:
Thomas Citharel 2018-04-11 15:55:16 +02:00
commit 9829c826ef
2 changed files with 3 additions and 3 deletions

View File

@ -18,7 +18,7 @@
*/
// FRAMADATE version
const VERSION = '1.1.0';
const VERSION = '1.1.1';
// PHP Needed version
const PHP_NEEDED_VERSION = '5.6';

View File

@ -1,5 +1,5 @@
<h1>{$poll->title|html|string_format:__('EditLink', 'Edit link for poll "%s"')}</h1>
<p>
{__('EditLink', 'Here is the link for editing your vote:')}
<a href="{poll_url id=$poll->admin_id vote_id=$editedVoteUniqueId}">{$poll->title|html}</a>
<a href="{poll_url id=$poll_id vote_id=$editedVoteUniqueId}">{$poll->title|html}</a>
</p>