aboutsummaryrefslogtreecommitdiffstats
path: root/view/en
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-04-11 18:47:21 +0200
committerMichael <icarus@dabo.de>2012-04-11 18:47:21 +0200
commitc3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (patch)
treea46d809d2e11fefba938717d38b1371572e4d815 /view/en
parent81a8d4f9dbd32de133e647c87a5394dd52f009fe (diff)
parentfe257a20324fe68838e5829e19d18777045a41b4 (diff)
downloadvolse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.gz
volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.bz2
volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/en')
-rw-r--r--[-rwxr-xr-x]view/en/follow_notify_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/friend_complete_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/htconfig.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/intro_complete_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/lostpass_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/passchanged_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/register_open_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/register_verify_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/en/request_notify_eml.tpl0
9 files changed, 0 insertions, 0 deletions
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl
index ae758c9a8..ae758c9a8 100755..100644
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl
index ab12fcb6b..ab12fcb6b 100755..100644
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 9e39eeb59..9e39eeb59 100755..100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl
index a60745ec5..a60745ec5 100755..100644
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl
index c350236a4..c350236a4 100755..100644
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl
index 9692159e1..9692159e1 100755..100644
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 221e6ec74..221e6ec74 100755..100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl
index 60c38d800..60c38d800 100755..100644
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl
index 9eef7a61e..9eef7a61e 100755..100644
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl