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
Alexander Kampmann	f208e7af36	tests for the template engine	2012-03-22 12:43:03 +01:00