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	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
cmnt_received_html_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
cmnt_received_text_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
follow_notify_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
friend_complete_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
htconfig.tpl	htconfig.tpl - Friendika -> Friendica	2012-02-20 19:47:44 -03:00
intro_complete_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
lostpass_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
mail_received_html_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
mail_received_text_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
messages.po	German translation	2012-03-10 10:36:20 +01:00
passchanged_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
register_open_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
register_verify_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
request_notify_eml.tpl	German translation more gender friendly. Some more logging in poller.php	2012-02-22 15:20:49 +01:00
strings.php	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-14 12:57:35 +01:00
wall_received_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
wall_received_html_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00
wall_received_text_body_eml.tpl	add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)	2012-01-18 16:21:30 -08:00