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/sv | |
| 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/sv')
| -rw-r--r--[-rwxr-xr-x] | view/sv/cmnt_received_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/follow_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/friend_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/htconfig.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/intro_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/lostpass_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/mail_received_html_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/mail_received_text_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/passchanged_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/register_open_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/register_verify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/request_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/strings.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/sv/wall_received_eml.tpl | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl index d87c7a1d1..d87c7a1d1 100755..100644 --- a/view/sv/cmnt_received_eml.tpl +++ b/view/sv/cmnt_received_eml.tpl diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index fee08bdca..fee08bdca 100755..100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index 2b8b0238e..2b8b0238e 100755..100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 76709ea75..76709ea75 100755..100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index 1f24af25f..1f24af25f 100755..100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index df338fa69..df338fa69 100755..100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl index a9a34c23a..a9a34c23a 100755..100644 --- a/view/sv/mail_received_html_body_eml.tpl +++ b/view/sv/mail_received_html_body_eml.tpl diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl index ac2857b58..ac2857b58 100755..100644 --- a/view/sv/mail_received_text_body_eml.tpl +++ b/view/sv/mail_received_text_body_eml.tpl diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 590462468..590462468 100755..100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 1471c9b98..1471c9b98 100755..100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index aa72bc9aa..aa72bc9aa 100755..100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 893bce17c..893bce17c 100755..100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl diff --git a/view/sv/strings.php b/view/sv/strings.php index eb434df66..eb434df66 100755..100644 --- a/view/sv/strings.php +++ b/view/sv/strings.php diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl index fc450a06d..fc450a06d 100755..100644 --- a/view/sv/wall_received_eml.tpl +++ b/view/sv/wall_received_eml.tpl |