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
Fabio Comuni	cbc60d525e	quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. ... remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts	2012-02-23 11:22:32 +01:00