diff options
author | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-04-08 10:33:32 +0200 |
commit | aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch) | |
tree | 1d7e5f2b575b8836fefe76660f466cb176585d5c /view/ca | |
parent | 64a1367525ac920721943a08adec1124657df70d (diff) | |
parent | e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff) | |
download | volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2 volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip |
Merge remote branch 'upstream/master'
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 |