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
..
fpostit
icons
js
communityhome.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
contact_template.tpl
directory_item.tpl
group_side.tpl
jot.tpl
mail_conv.tpl
mail_display.tpl
mail_list.tpl
message_side.tpl
nav.tpl
photo_view.tpl
profile_side.tpl
profile_vcard.tpl
right_aside.tpl
rs_common_tabs.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
screenshot.png
search_item.tpl
style-network.css
style-profile.css
style-settings.css
style.css
theme.php
wall_item.tpl
wallwall_item.tpl