Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica ... Conflicts: view/de/strings.php		2012-03-14 12:57:35 +01: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	German translation	2012-03-10 10:36:20 +01:00
passchanged_eml.tpl	…
register_open_eml.tpl	…
register_verify_eml.tpl	…
request_notify_eml.tpl	…
strings.php	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-14 12:57:35 +01:00
wall_received_eml.tpl	…
wall_received_html_body_eml.tpl	…
wall_received_text_body_eml.tpl	…