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
..
follow_notify_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
friend_complete_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
htconfig.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
intro_complete_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
lostpass_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
passchanged_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
register_open_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
register_verify_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
request_notify_eml.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00