Updating branch refs/heads/master
to 0a2bfa581073c4836c653d7ad6cae63e41a30a89 (commit)
from 2e0a51209982062c4d2ea9127845813c5de5ff6c (commit)
commit 0a2bfa581073c4836c653d7ad6cae63e41a30a89
Author: Nick Schermer <[email protected]>
Date: Tue Oct 18 18:09:25 2011 +0200
Update mail address.
lib/views/email/login_forget.erb | 2 +-
lib/views/email/maintainer_activated.erb | 2 +-
lib/views/email/maintainer_change_email.erb | 2 +-
lib/views/email/maintainer_change_ssh.erb | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/views/email/login_forget.erb b/lib/views/email/login_forget.erb
index 50e4904..ae5eca8 100644
--- a/lib/views/email/login_forget.erb
+++ b/lib/views/email/login_forget.erb
@@ -12,7 +12,7 @@ If you are not the person who made this request, or you wish
to cancel this requ
If you do nothing, the request will lapse after 2 hours (<%=
params[:token_expire] %>) or when you log in successfully.
-The request was generated from <%= request.env['REMOTE_ADDR'] %>. Forward this
email to the Xfce administrators <[email protected]> in case of problems.
+The request was generated from <%= request.env['REMOTE_ADDR'] %>. Forward this
email to the Xfce administrators <[email protected]> in case of problems.
Always at your service.
diff --git a/lib/views/email/maintainer_activated.erb
b/lib/views/email/maintainer_activated.erb
index 3a11a42..c811687 100644
--- a/lib/views/email/maintainer_activated.erb
+++ b/lib/views/email/maintainer_activated.erb
@@ -4,7 +4,7 @@ Your account has been activated. You can view your permissions
in the profile ta
Please keep in mind that updating the SSH public-keys on the server can take
up to 1 hour.
-If you have any questions, don't hesitate to contact us at <[email protected]>.
+If you have any questions, don't hesitate to contact us at <[email protected]>.
Always at your service.
diff --git a/lib/views/email/maintainer_change_email.erb
b/lib/views/email/maintainer_change_email.erb
index e40e8b2..aa3a464 100644
--- a/lib/views/email/maintainer_change_email.erb
+++ b/lib/views/email/maintainer_change_email.erb
@@ -2,7 +2,7 @@ Hello <%= @maintainer.username %>, this is Moka at <%=
Moka::Models::Configurati
Your e-mail address was changed from <%= @maintainer.email %> to <%=
params[:email] %> from IP <%= request.env['REMOTE_ADDR'] %> on <%=
Time.now.to_s %>.
-If you think someone else logged into your account, please forward this email
to the Xfce developers at <[email protected]>.
+If you think someone else logged into your account, please forward this email
to the Xfce developers at <[email protected]>.
Always at your service.
diff --git a/lib/views/email/maintainer_change_ssh.erb
b/lib/views/email/maintainer_change_ssh.erb
index 5c503f5..ec46b51 100644
--- a/lib/views/email/maintainer_change_ssh.erb
+++ b/lib/views/email/maintainer_change_ssh.erb
@@ -2,7 +2,7 @@ Hello <%= @maintainer.username %>, this is Moka at <%=
Moka::Models::Configurati
Your SSH public-keys were changed from IP <%= request.env['REMOTE_ADDR'] %> on
<%= Time.now.to_s %>.
-If you think someone else logged into your account, please forward this email
to the Xfce developers at <[email protected]>.
+If you think someone else logged into your account, please forward this email
to the Xfce developers at <[email protected]>.
Always at your service.
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
