friendica/view/theme/facepark
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
..
border.jpg
comment_item.tpl
contact_template.tpl
conversation.tpl
ff-16.jpg
file.gif
friendika-16.png
group_side.tpl
head.jpg
jot.tpl
lock.cur
login-bg.gif
nav.tpl
nets.tpl
photo-menu.jpg
profile_vcard.tpl
saved_searches_aside.tpl
search_item.tpl
shiny.png
style.css
theme.php
unsupported
wall_item.tpl
wallwall_item.tpl