This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

..

icons

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

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

article.gif

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

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

audio.gif

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

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

b_block.gif

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

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

b_drop.gif

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

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

b_drop.png

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

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

b_drophide.gif

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

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

b_dropshow.gif

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

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

b_edit.gif

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

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

b_edit.png

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

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

beer_mug.gif

More improved transparency for smilies

2012-03-09 01:49:12 +00:00

blank.png

theme screenshots

2012-03-25 17:55:43 -07:00

bug-x.gif

add img

2012-03-06 08:31:54 +01:00

calendar.png

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

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

camera-icon.gif

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

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

coffee.gif

…

connect-bg.png

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

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

content-types.png

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

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

default-group-mm.png

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

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

default-profile-mm.jpg

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

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

default-profile-sm.jpg

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

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

default-profile.jpg

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

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

diaspora.png

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

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

dislike.gif

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

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

document.gif

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

ff-32.jpg

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

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

ff-64.jpg

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

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

ff-128.jpg

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

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

ff-256.jpg

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

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

ff.xcf

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

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

friendica-16.jpg

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

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

friendica-16.png

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

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

friendica-32.jpg

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

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

friendica-32.png

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

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

friendica-48.png

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

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

friendica-64.jpg

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

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

friendica-64.png

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

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

friendica-96.png

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

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

friendica-128.jpg

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

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

friendica-128.png

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

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

friendica-256.jpg

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

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

friendica-256.png

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

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

friendica-1600.png

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

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

friendica.svg

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

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

friendika-16.jpg

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

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

friendika-16.png

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

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

friendika-32.jpg

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

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

friendika-32.png

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

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

friendika-48.png

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

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

friendika-64.jpg

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

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

friendika-64.png

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

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

friendika-96.png

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

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

friendika-128.jpg

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

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

friendika-128.png

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

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

friendika-256.jpg

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

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

friendika-256.png

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

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

friendika-1600.png

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

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

friendika.svg

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

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

globe.gif

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

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

hide_off.png

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

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

hide_on.png

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

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

icons.png

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

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

larrow.gif

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

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

larrw.gif

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

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

like.gif

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

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

link-icon.gif

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

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

lock_icon.gif

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

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

logo.png

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

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

lrarrow.gif

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

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

mapicon.gif

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

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

no.gif

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

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

noglobe.gif

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

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

nosign.jpg

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

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

onoff.jpg

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

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

pause.gif

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

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

pen.png

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

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

pencil.gif

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

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

penhover.png

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

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

people.gif

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

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

person-48.jpg

change default profile photo to something more interesting than a reddish brown square

2012-03-20 15:41:06 -07:00

person-80.jpg

change default profile photo to something more interesting than a reddish brown square

2012-03-20 15:41:06 -07:00

person-175.jpg

change default profile photo to something more interesting than a reddish brown square

2012-03-20 15:41:06 -07:00

play.gif

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

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

plugin.png

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

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

rarrow.gif

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

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

rarrw.gif

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

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

recycle.gif

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

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

remote-link.gif

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

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

rotator.gif

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

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

search_18.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

share.gif

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

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

show_all_off.png

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

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

show_all_on.png

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

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

show_off.png

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

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

show_on.png

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

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

smiley-bangheaddesk.gif

…

smiley-beard.png

improved smiley transparency

2012-03-06 23:54:31 +00:00

smiley-brokenheart.gif

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

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

smiley-cool.gif

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

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

smiley-cry.gif

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

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

smiley-embarassed.gif

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

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

smiley-facepalm.gif

…

smiley-foot-in-mouth.gif

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

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

smiley-frown.gif

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

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

smiley-heart.gif

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

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

smiley-innocent.gif

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

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

smiley-kiss.gif

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

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

smiley-laughing.gif

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

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

smiley-money-mouth.gif

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

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

smiley-Oo.gif

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

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

smiley-sealed.gif

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

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

smiley-shaka.gif

…

smiley-smile.gif

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

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

smiley-surprised.gif

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

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

smiley-thumbsup.gif

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

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

smiley-tongue-out.gif

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

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

smiley-undecided.gif

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

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

smiley-whitebeard.png

improved smiley transparency

2012-03-06 23:54:31 +00:00

smiley-wink.gif

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

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

smiley-yell.gif

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

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

spencil.gif

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

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

star_dummy.png

fixed star/unstar

2012-03-03 19:07:55 +01:00

star.png

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

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

tag_b.png

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

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

tag.png

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

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

tools.png

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

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

twopeople.png

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

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

unlock_icon.gif

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

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

video.gif

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

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

youtube_icon.gif

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

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