tobias/friendica
1
0
Fork 0
Code Pull requests Activity
friendica/library/simplepie/demo/for_the_demo/favicons
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
..
alternate.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
blinklist.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
blogmarks.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
delicious.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
digg.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
magnolia.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
myweb2.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
newsvine.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
reddit.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
segnalo.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
simpy.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
spurl.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
technorati.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wists.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00