2 commits

Author	SHA1	Message	Date
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
friendica	5c2fdc795f	send unverified private mail using zrl	2012-04-01 00:59:35 -07:00