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/ca | |
| 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/ca')
| -rw-r--r--[-rwxr-xr-x] | view/ca/cmnt_received_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/follow_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/friend_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/htconfig.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/intro_complete_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/lostpass_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/mail_received_html_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/mail_received_text_body_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/messages.po | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/passchanged_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/register_open_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/register_verify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/request_notify_eml.tpl | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/strings.php | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | view/ca/wall_received_eml.tpl | 0 |
15 files changed, 0 insertions, 0 deletions
diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl index ca61ca492..ca61ca492 100755..100644 --- a/view/ca/cmnt_received_eml.tpl +++ b/view/ca/cmnt_received_eml.tpl diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl index ab5a4b371..ab5a4b371 100755..100644 --- a/view/ca/follow_notify_eml.tpl +++ b/view/ca/follow_notify_eml.tpl diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl index 539d9ff3d..539d9ff3d 100755..100644 --- a/view/ca/friend_complete_eml.tpl +++ b/view/ca/friend_complete_eml.tpl diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl index 28446f3df..28446f3df 100755..100644 --- a/view/ca/htconfig.tpl +++ b/view/ca/htconfig.tpl diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl index 70507d71d..70507d71d 100755..100644 --- a/view/ca/intro_complete_eml.tpl +++ b/view/ca/intro_complete_eml.tpl diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl index eccf2050a..eccf2050a 100755..100644 --- a/view/ca/lostpass_eml.tpl +++ b/view/ca/lostpass_eml.tpl diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl index 64eee0bf1..64eee0bf1 100755..100644 --- a/view/ca/mail_received_html_body_eml.tpl +++ b/view/ca/mail_received_html_body_eml.tpl diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl index b343c4e6d..b343c4e6d 100755..100644 --- a/view/ca/mail_received_text_body_eml.tpl +++ b/view/ca/mail_received_text_body_eml.tpl diff --git a/view/ca/messages.po b/view/ca/messages.po index 8463ceb12..8463ceb12 100755..100644 --- a/view/ca/messages.po +++ b/view/ca/messages.po diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl index 22e54b8c0..22e54b8c0 100755..100644 --- a/view/ca/passchanged_eml.tpl +++ b/view/ca/passchanged_eml.tpl diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl index 0170c98e3..0170c98e3 100755..100644 --- a/view/ca/register_open_eml.tpl +++ b/view/ca/register_open_eml.tpl diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl index 3dd966e0a..3dd966e0a 100755..100644 --- a/view/ca/register_verify_eml.tpl +++ b/view/ca/register_verify_eml.tpl diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl index 276624aae..276624aae 100755..100644 --- a/view/ca/request_notify_eml.tpl +++ b/view/ca/request_notify_eml.tpl diff --git a/view/ca/strings.php b/view/ca/strings.php index e5aed8be6..e5aed8be6 100755..100644 --- a/view/ca/strings.php +++ b/view/ca/strings.php diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl index 0b5c150fd..0b5c150fd 100755..100644 --- a/view/ca/wall_received_eml.tpl +++ b/view/ca/wall_received_eml.tpl |