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	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
icons	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
js
communityhome.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
contact_template.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
directory_item.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
group_side.tpl	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
nav.tpl
photo_view.tpl	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
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	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
style-network.css	make right_aside translatable and provide german translation...	2012-04-03 20:59:00 +02:00
style-profile.css	make right_aside translatable and provide german translation...	2012-04-03 20:59:00 +02:00
style-settings.css	make right_aside translatable and provide german translation...	2012-04-03 20:59:00 +02:00
style.css	make right_aside translatable and provide german translation...	2012-04-03 20:59:00 +02:00
theme.php	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
wall_item.tpl
wallwall_item.tpl