Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica ... Conflicts: include/poller.php		2013-01-20 14:17:09 +01:00
..
css
font
smarty3
calendar.png
colors.less
comment_item.tpl
icons.less
icons.png
icons.svg
lock.cur
mail_list.tpl
nav.tpl
profile_edlink.tpl
profile_vcard.tpl	Diaspora: Auto-adding users as friend who already sharing with us	2013-01-20 14:08:28 +01:00
quattro.less
screenshot.jpg
search_item.tpl
style.css
style.less
theme.php
threaded_conversation.tpl
wall_thread.tpl