aboutsummaryrefslogtreecommitdiffstats
path: root/view/ca
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-07 18:35:29 +0200
commitcb05801a9031254f5882038de07a3ee4d5f89dd0 (patch)
tree186d9d1a4c591ec23e0e5bbebd08301143b5c157 /view/ca
parent7308dbae282194356c2e95936aecc15ea059f356 (diff)
parent0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff)
downloadvolse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2
volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip
Merge commit 'upstream/master'
Diffstat (limited to 'view/ca')
-rw-r--r--[-rwxr-xr-x]view/ca/cmnt_received_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/follow_notify_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/friend_complete_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/htconfig.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/intro_complete_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/lostpass_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/mail_received_html_body_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/mail_received_text_body_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/messages.po0
-rw-r--r--[-rwxr-xr-x]view/ca/passchanged_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/register_open_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/register_verify_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/request_notify_eml.tpl0
-rw-r--r--[-rwxr-xr-x]view/ca/strings.php0
-rw-r--r--[-rwxr-xr-x]view/ca/wall_received_eml.tpl0
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