Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php		2012-04-05 13:39:15 +02:00
..
cmnt_received_eml.tpl
cmnt_received_html_body_eml.tpl
cmnt_received_text_body_eml.tpl
follow_notify_eml.tpl
friend_complete_eml.tpl
htconfig.tpl
intro_complete_eml.tpl
lostpass_eml.tpl
mail_received_html_body_eml.tpl
mail_received_text_body_eml.tpl
messages.po
passchanged_eml.tpl
register_open_eml.tpl
register_verify_eml.tpl
request_notify_eml.tpl
strings.php
wall_received_eml.tpl
wall_received_html_body_eml.tpl
wall_received_text_body_eml.tpl