nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
friendica/library/simplepie/demo/for_the_demo
History
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 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
source_files Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
alternate_favicon.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
background_blockquote.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
background_menuitem.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
background_menuitem_off.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
background_menuitem_shadow.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
feed.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
logo_simplepie_demo.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lucida-grande-bold.swf Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mediaplayer.swf Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mediaplayer_readme.htm Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mini_podcast.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
place_audio.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
place_video.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sifr-config.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sIFR-print.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sIFR-screen.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sifr.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
simplepie.css Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sleight.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
top_gradient.gif Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
verdana.swf Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
yanone-kaffeesatz-bold.swf Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00