friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
friendica/library/simplepie/demo/for_the_demo/source_files/sIFR-r245
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
..
SifrStyleSheet.as Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
_README_.txt Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
options.as Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sIFR.as Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
sifr.fla Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00