friendica a29842e301 Merge https://github.com/annando/friendica into annando ... Conflicts: view/admin_site.tpl		2012-12-22 23:02:21 -08:00
..
css
font
smarty3
calendar.png
colors.less
comment_item.tpl
icons.less
icons.png
icons.svg
lock.cur
mail_list.tpl
nav.tpl
quattro.less
screenshot.jpg
search_item.tpl
style.css
style.less
theme.php	Merge https://github.com/annando/friendica into annando	2012-12-22 23:02:21 -08:00
threaded_conversation.tpl
wall_thread.tpl	Merge https://github.com/annando/friendica into annando	2012-12-22 23:02:21 -08:00