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/es | |
| 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/es')
| -rw-r--r--[-rwxr-xr-x] | view/es/cmnt_received_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/follow_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/friend_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/htconfig.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/intro_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/lostpass_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/mail_received_html_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/mail_received_text_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/messages.po | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/passchanged_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/register_open_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/register_verify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/request_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/strings.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/es/wall_received_eml.tpl | 0 |
15 files changed, 0 insertions, 0 deletions
diff --git a/view/es/cmnt_received_eml.tpl b/view/es/cmnt_received_eml.tpl index abf2d95df..abf2d95df 100755..100644 --- a/view/es/cmnt_received_eml.tpl +++ b/view/es/cmnt_received_eml.tpl diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl index 17bd2c01c..17bd2c01c 100755..100644 --- a/view/es/follow_notify_eml.tpl +++ b/view/es/follow_notify_eml.tpl diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl index 0dc867efd..0dc867efd 100755..100644 --- a/view/es/friend_complete_eml.tpl +++ b/view/es/friend_complete_eml.tpl diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl index 6158f6a33..6158f6a33 100755..100644 --- a/view/es/htconfig.tpl +++ b/view/es/htconfig.tpl diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl index a2964808c..a2964808c 100755..100644 --- a/view/es/intro_complete_eml.tpl +++ b/view/es/intro_complete_eml.tpl diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl index 607744bfe..607744bfe 100755..100644 --- a/view/es/lostpass_eml.tpl +++ b/view/es/lostpass_eml.tpl diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl index 5086ec246..5086ec246 100755..100644 --- a/view/es/mail_received_html_body_eml.tpl +++ b/view/es/mail_received_html_body_eml.tpl diff --git a/view/es/mail_received_text_body_eml.tpl b/view/es/mail_received_text_body_eml.tpl index 8400b9d01..8400b9d01 100755..100644 --- a/view/es/mail_received_text_body_eml.tpl +++ b/view/es/mail_received_text_body_eml.tpl diff --git a/view/es/messages.po b/view/es/messages.po index d3f8557e9..d3f8557e9 100755..100644 --- a/view/es/messages.po +++ b/view/es/messages.po diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl index 7959846b7..7959846b7 100755..100644 --- a/view/es/passchanged_eml.tpl +++ b/view/es/passchanged_eml.tpl diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl index 7c7a90b40..7c7a90b40 100755..100644 --- a/view/es/register_open_eml.tpl +++ b/view/es/register_open_eml.tpl diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl index 9f2cc4d9b..9f2cc4d9b 100755..100644 --- a/view/es/register_verify_eml.tpl +++ b/view/es/register_verify_eml.tpl diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl index 6161c45c1..6161c45c1 100755..100644 --- a/view/es/request_notify_eml.tpl +++ b/view/es/request_notify_eml.tpl diff --git a/view/es/strings.php b/view/es/strings.php index ac53a45a9..ac53a45a9 100755..100644 --- a/view/es/strings.php +++ b/view/es/strings.php diff --git a/view/es/wall_received_eml.tpl b/view/es/wall_received_eml.tpl index 4cd253c72..4cd253c72 100755..100644 --- a/view/es/wall_received_eml.tpl +++ b/view/es/wall_received_eml.tpl |