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
..
border.jpg	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
ff-16.jpg	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
file.gif	file as widget and basic filing implementation for duepuntozero,slackr	2012-03-13 18:13:03 -07:00
friendika-16.png	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
head.jpg	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
lock.cur	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
login-bg.gif	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
photo-menu.jpg	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
screenshot.jpg	screenshot gallery	2012-03-25 20:08:28 -07:00
shiny.png	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
style.css	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
theme.php	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00