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
..
favicons
source_files
alternate_favicon.png
background_blockquote.png
background_menuitem.gif
background_menuitem_off.gif
background_menuitem_shadow.gif
feed.png
logo_simplepie_demo.png
lucida-grande-bold.swf
mediaplayer.swf
mediaplayer_readme.htm
mini_podcast.png
place_audio.png
place_video.png
sifr-config.js
sIFR-print.css
sIFR-screen.css
sifr.js
simplepie.css
sleight.js
top_gradient.gif
verdana.swf
yanone-kaffeesatz-bold.swf