Merge branch 'stable' into develop

Changelog.md

@@ -40,6 +40,7 @@ Ruby 2.0 is no longer officially supported.
 * Enable aspect sorting again [#5559](https://github.com/diaspora/diaspora/pull/5559)
 * Submit messages in conversations with Ctrl+Enter [#5910](https://github.com/diaspora/diaspora/pull/5910)
 * Support syntax highlighting for fenced code blocks [#5908](https://github.com/diaspora/diaspora/pull/5908)
+* Added link to diasporafoundation.org to invitation email [#5893](https://github.com/diaspora/diaspora/pull/5893)
 
 # 0.5.0.0
 

app/views/notifier/invite.markerb

@@ -1 +1 @@
-<%= t('.message', :invite_url => invite_code_url(@invitation_code)) %>
+<%= t('.message', :invite_url => invite_code_url(@invitation_code), :diasporafoundation_url => 'https://diasporafoundation.org/') %>

config/locales/diaspora/en.yml

@@ -851,7 +851,10 @@ en:
 
         The diaspora* email robot!
 
+        P.S.: Just in case you don't know (yet) what diaspora* is, [here][2] is the answer!
+
         [1]: %{invite_url}
+        [2]: %{diasporafoundation_url}
     remove_old_user:
       subject: "Your diaspora* account has been flagged for removal due to inactivity"
       body: |-