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/fr | |
| 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/fr')
| -rw-r--r--[-rwxr-xr-x] | view/fr/cmnt_received_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/cmnt_received_html_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/cmnt_received_text_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/follow_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/friend_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/htconfig.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/intro_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/lostpass_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/mail_received_html_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/mail_received_text_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/messages.po | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/passchanged_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/register_open_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/register_verify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/request_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/strings.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/fr/wall_received_eml.tpl | 0 |
17 files changed, 0 insertions, 0 deletions
diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl index ee98d98de..ee98d98de 100755..100644 --- a/view/fr/cmnt_received_eml.tpl +++ b/view/fr/cmnt_received_eml.tpl diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl index 1d904c53c..1d904c53c 100755..100644 --- a/view/fr/cmnt_received_html_body_eml.tpl +++ b/view/fr/cmnt_received_html_body_eml.tpl diff --git a/view/fr/cmnt_received_text_body_eml.tpl b/view/fr/cmnt_received_text_body_eml.tpl index d46632138..d46632138 100755..100644 --- a/view/fr/cmnt_received_text_body_eml.tpl +++ b/view/fr/cmnt_received_text_body_eml.tpl diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl index c77a3e427..c77a3e427 100755..100644 --- a/view/fr/follow_notify_eml.tpl +++ b/view/fr/follow_notify_eml.tpl diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl index 9b9c551fe..9b9c551fe 100755..100644 --- a/view/fr/friend_complete_eml.tpl +++ b/view/fr/friend_complete_eml.tpl diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 76709ea75..76709ea75 100755..100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index b8a7a3457..b8a7a3457 100755..100644 --- a/view/fr/intro_complete_eml.tpl +++ b/view/fr/intro_complete_eml.tpl diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index 168e9a5e2..168e9a5e2 100755..100644 --- a/view/fr/lostpass_eml.tpl +++ b/view/fr/lostpass_eml.tpl diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl index 55e8b8a73..55e8b8a73 100755..100644 --- a/view/fr/mail_received_html_body_eml.tpl +++ b/view/fr/mail_received_html_body_eml.tpl diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl index c877344e0..c877344e0 100755..100644 --- a/view/fr/mail_received_text_body_eml.tpl +++ b/view/fr/mail_received_text_body_eml.tpl diff --git a/view/fr/messages.po b/view/fr/messages.po index 345405760..345405760 100755..100644 --- a/view/fr/messages.po +++ b/view/fr/messages.po diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index c1881b13e..c1881b13e 100755..100644 --- a/view/fr/passchanged_eml.tpl +++ b/view/fr/passchanged_eml.tpl diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl index d61a5996d..d61a5996d 100755..100644 --- a/view/fr/register_open_eml.tpl +++ b/view/fr/register_open_eml.tpl diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl index 54362ce18..54362ce18 100755..100644 --- a/view/fr/register_verify_eml.tpl +++ b/view/fr/register_verify_eml.tpl diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index afbb2ab7e..afbb2ab7e 100755..100644 --- a/view/fr/request_notify_eml.tpl +++ b/view/fr/request_notify_eml.tpl diff --git a/view/fr/strings.php b/view/fr/strings.php index dda24d3be..dda24d3be 100755..100644 --- a/view/fr/strings.php +++ b/view/fr/strings.php diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl index adfb91dd8..adfb91dd8 100755..100644 --- a/view/fr/wall_received_eml.tpl +++ b/view/fr/wall_received_eml.tpl |