friendica-github/view/theme/diabook-aerith/icons
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
..
attach.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
audio.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
bluebug.png
camera.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
close_box.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
com_side.png
community.png
contacts.png
contacts2.png
dislike.png
drop.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
email.png
events.png
facebook.png
file_as.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
ftdevs.gif
globe.png
home.png
language.png
like.png
link.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
livejournal.png
lock.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
lupe.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mess_side.png
messages.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
messages2.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
next.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notes.png
notifications.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notify.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
notify2.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pencil.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pencil2.png
photo-menu.jpg Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
posterous.png
prev.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
pscontacts.png
pubgroups.png
recycle.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
remote.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
scroll_top.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
selected.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
srch_bg.gif
srch_l.gif
srch_r.gif
srch_r_f2.gif
star.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
star_dummy.png
starred.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
StatusNet.png
tagged.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
toogle_off.png
toogle_on.png
tumblr.png
twitter.png
unlock.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
unstarred.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
video.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
weblink.png Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
wordpress.png