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/it | |
| 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/it')
19 files changed, 0 insertions, 0 deletions
diff --git a/view/it/cmnt_received_eml.tpl b/view/it/cmnt_received_eml.tpl index 1991d29ae..1991d29ae 100755..100644 --- a/view/it/cmnt_received_eml.tpl +++ b/view/it/cmnt_received_eml.tpl diff --git a/view/it/cmnt_received_html_body_eml.tpl b/view/it/cmnt_received_html_body_eml.tpl index 5f2edb84b..5f2edb84b 100755..100644 --- a/view/it/cmnt_received_html_body_eml.tpl +++ b/view/it/cmnt_received_html_body_eml.tpl diff --git a/view/it/cmnt_received_text_body_eml.tpl b/view/it/cmnt_received_text_body_eml.tpl index 1991d29ae..1991d29ae 100755..100644 --- a/view/it/cmnt_received_text_body_eml.tpl +++ b/view/it/cmnt_received_text_body_eml.tpl diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl index 635dbbc29..635dbbc29 100755..100644 --- a/view/it/follow_notify_eml.tpl +++ b/view/it/follow_notify_eml.tpl diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl index 67ad67b05..67ad67b05 100755..100644 --- a/view/it/friend_complete_eml.tpl +++ b/view/it/friend_complete_eml.tpl diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl index 6158f6a33..6158f6a33 100755..100644 --- a/view/it/htconfig.tpl +++ b/view/it/htconfig.tpl diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl index 9da946a56..9da946a56 100755..100644 --- a/view/it/intro_complete_eml.tpl +++ b/view/it/intro_complete_eml.tpl diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl index 7349717ea..7349717ea 100755..100644 --- a/view/it/lostpass_eml.tpl +++ b/view/it/lostpass_eml.tpl diff --git a/view/it/mail_received_html_body_eml.tpl b/view/it/mail_received_html_body_eml.tpl index 847954550..847954550 100755..100644 --- a/view/it/mail_received_html_body_eml.tpl +++ b/view/it/mail_received_html_body_eml.tpl diff --git a/view/it/mail_received_text_body_eml.tpl b/view/it/mail_received_text_body_eml.tpl index c7da9533f..c7da9533f 100755..100644 --- a/view/it/mail_received_text_body_eml.tpl +++ b/view/it/mail_received_text_body_eml.tpl diff --git a/view/it/messages.po b/view/it/messages.po index e0375764f..e0375764f 100755..100644 --- a/view/it/messages.po +++ b/view/it/messages.po diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl index 290e4db94..290e4db94 100755..100644 --- a/view/it/passchanged_eml.tpl +++ b/view/it/passchanged_eml.tpl diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl index e5f5af80c..e5f5af80c 100755..100644 --- a/view/it/register_open_eml.tpl +++ b/view/it/register_open_eml.tpl diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl index f1a34dbf4..f1a34dbf4 100755..100644 --- a/view/it/register_verify_eml.tpl +++ b/view/it/register_verify_eml.tpl diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl index 50532cbd4..50532cbd4 100755..100644 --- a/view/it/request_notify_eml.tpl +++ b/view/it/request_notify_eml.tpl diff --git a/view/it/strings.php b/view/it/strings.php index 5fd187f7a..5fd187f7a 100755..100644 --- a/view/it/strings.php +++ b/view/it/strings.php diff --git a/view/it/wall_received_eml.tpl b/view/it/wall_received_eml.tpl index ba9e25901..ba9e25901 100755..100644 --- a/view/it/wall_received_eml.tpl +++ b/view/it/wall_received_eml.tpl diff --git a/view/it/wall_received_html_body_eml.tpl b/view/it/wall_received_html_body_eml.tpl index cdc05cfa3..cdc05cfa3 100755..100644 --- a/view/it/wall_received_html_body_eml.tpl +++ b/view/it/wall_received_html_body_eml.tpl diff --git a/view/it/wall_received_text_body_eml.tpl b/view/it/wall_received_text_body_eml.tpl index 327557ea1..327557ea1 100755..100644 --- a/view/it/wall_received_text_body_eml.tpl +++ b/view/it/wall_received_text_body_eml.tpl |