diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-04-05 13:39:15 +0200 |
| commit | 355c42cb309eb1313097411067ca999b699aa620 (patch) | |
| tree | d00d1af9dceecdf114cadff924c5ba4a864fbf43 /view/en | |
| parent | cbf4544887c7f496f2b2312727fe7bcb64a6d6c8 (diff) | |
| parent | 9b6e91086b29554fd04362f6c87ea148718e8b1c (diff) | |
| download | volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.gz volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.tar.bz2 volse-hubzilla-355c42cb309eb1313097411067ca999b699aa620.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
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 |