diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
commit | cb05801a9031254f5882038de07a3ee4d5f89dd0 (patch) | |
tree | 186d9d1a4c591ec23e0e5bbebd08301143b5c157 /view/en | |
parent | 7308dbae282194356c2e95936aecc15ea059f356 (diff) | |
parent | 0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff) | |
download | volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2 volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'view/en')
-rw-r--r--[-rwxr-xr-x] | view/en/follow_notify_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/friend_complete_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/htconfig.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/intro_complete_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/lostpass_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/passchanged_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/register_open_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/register_verify_eml.tpl | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | view/en/request_notify_eml.tpl | 0 |
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 |