friendica/images/icons/16
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
lock.png
menu.png
notice.png
notify_off.png
notify_on.png
play.png
plugin.png
star.png
text.png quattro: icons for attachments 2012-02-15 11:10:02 +01:00
unlock.png
user.png
video.png quattro: icons for attachments 2012-02-15 11:10:02 +01:00
zip.png