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

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

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

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

community.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

contacts2.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

contacts.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

dislike.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

drop.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

email.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

events.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

facebook.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

file_as.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

ftdevs.gif

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

globe.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

home.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

language.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

like.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

link.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

livejournal.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

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

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

messages2.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

messages.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

next.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

notes.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

notifications.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

notify2.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

notify.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

pencil2.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

pencil.png

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

posterous.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

prev.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

pscontacts.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

pubgroups.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

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

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

srch_l.gif

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

srch_r_f2.gif

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

srch_r.gif

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

star_dummy.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

star.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

starred.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

StatusNet.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

tagged.png

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

toogle_off.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

toogle_on.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

tumblr.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

twitter.png

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00

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

add themes diabook-red & diabook-aerith

2012-03-30 13:48:34 +02:00