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
..
add.png
audio.png
delete.png
edit.png
feed.png
gear.png
group.png
image.png
info.png
link.png	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
lock.png
menu.png
notice.png
notify_off.png
notify_on.png
play.png
plugin.png
star.png	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-05 13:39:15 +02:00
text.png
unlock.png
user.png
video.png
zip.png