Merge branch 'rootwork-master-patch-42184' into 'master'

Correct link in password reset email, from demo site forum to Mobilizon forum

Closes #779

See merge request framasoft/mobilizon!981
This commit is contained in:
Thomas Citharel 2021-07-21 09:03:26 +00:00
commit a31e97110b
2 changed files with 2 additions and 2 deletions

View File

@ -114,7 +114,7 @@
<h2 style="font-size: 20px; font-weight: 400; color: #FFFFFF; margin: 0;"> <h2 style="font-size: 20px; font-weight: 400; color: #FFFFFF; margin: 0;">
<%= gettext "Need help? Is something not working as expected?" %> <%= gettext "Need help? Is something not working as expected?" %>
</h2> </h2>
<p style="margin: 0;"><a href="https://framacolibri.org/c/mobilizon/test-mobilizon" target="_blank" style="color: #FFFFFF;"> <p style="margin: 0;"><a href="https://framacolibri.org/c/mobilizon/39" target="_blank" style="color: #FFFFFF;">
<%= gettext "Ask the community on Framacolibri" %> <%= gettext "Ask the community on Framacolibri" %>
</a></p> </a></p>
</td> </td>

View File

@ -6,6 +6,6 @@
<% end %> <% end %>
<%= gettext "Need help? Is something not working as expected?" %> <%= gettext "Need help? Is something not working as expected?" %>
<%= gettext "Ask the community on Framacolibri" %> https://framacolibri.org/c/mobilizon/test-mobilizon <%= gettext "Ask the community on Framacolibri" %> https://framacolibri.org/c/mobilizon/39
<%= gettext "%{instance} is powered by Mobilizon.", instance: @instance[:name] %> <%= gettext "Learn more about Mobilizon here!" %> https://joinmobilizon.org <%= gettext "%{instance} is powered by Mobilizon.", instance: @instance[:name] %> <%= gettext "Learn more about Mobilizon here!" %> https://joinmobilizon.org