Merge remote branch 'upstream/master'

4 files changed, 0 insertions, 75 deletions

diff --git a/view/en-gb/follow_notify_eml.tpl b/view/en-gb/follow_notify_eml.tpl
deleted file mode 100644
index ba07b19da..000000000
--- a/view/en-gb/follow_notify_eml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Dear {{$myname}},
-
-You have a new follower at {{$sitename}} -  '{{$requestor}}'.
-
-You may visit their profile at {{$url}}.
-
-Please login to your site to approve or ignore/cancel the request.
-
-{{$siteurl}}
-
-Regards,
-
-	{{$sitename}} administrator
diff --git a/view/en-gb/friend_complete_eml.tpl b/view/en-gb/friend_complete_eml.tpl
deleted file mode 100644
index 1c647b994..000000000
--- a/view/en-gb/friend_complete_eml.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Dear {{$username}},
-
-	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
-your connection request at '{{$sitename}}'.
-
-You are now mutual friends and may exchange status updates, photos, and email
-without restriction.
-
-Please visit your 'Connnections' page at {{$sitename}} if you wish to make 
-any changes to this relationship. 
-
-{{$siteurl}}
-
-[For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '{{$fn}}'].
-
-Sincerely,
-
-	{{$sitename}} Administrator
-
- 
diff --git a/view/en-gb/intro_complete_eml.tpl b/view/en-gb/intro_complete_eml.tpl
deleted file mode 100644
index 2c2428d68..000000000
--- a/view/en-gb/intro_complete_eml.tpl
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Dear {{$username}},
-
-	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
-your connection request at '{{$sitename}}'.
-
-	'{{$fn}}' has chosen to accept you a "fan", which restricts 
-some forms of communication - such as private messaging and some profile
-interactions. If this is a celebrity or community page, these settings were
-applied automatically.
-
-	'{{$fn}}' may choose to extend this into a two-way or more permissive 
-relationship in the future. 
-
-	You will start receiving public status updates from '{{$fn}}', 
-which will appear on your 'Matrix' page at  
-
-{{$siteurl}}
-
-Sincerely,
-
-	{{$sitename}} Administrator
diff --git a/view/en-gb/request_notify_eml.tpl b/view/en-gb/request_notify_eml.tpl
deleted file mode 100644
index d01b8ff27..000000000
--- a/view/en-gb/request_notify_eml.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Dear {{$myname}},
-
-You have just received a connection request at {{$sitename}} 
-
-from '{{$requestor}}'.
-
-You may visit their profile at {{$url}}.
-
-Please login to your site to view the complete introduction 
-and approve or ignore/cancel the request.
-
-{{$siteurl}}
-
-Regards,
-
-	{{$sitename}} administrator