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
..
dark	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
green	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
comment_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
config.php	…
contact_template.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
conversation.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
experimental	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
fileas_widget.tpl	…
group_side.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
icons.less	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
jot.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
mail_conv.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
mail_display.tpl	…
mail_list.tpl	…
message_side.tpl	…
msg-header.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
nav.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
nets.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
profile_vcard.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
quattro.less	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
saved_searches_aside.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
screenshot.jpg	…
search_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
style.php	…
theme.php	…
theme_settings.tpl	…
wall_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
wallwall_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00