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

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

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

audio.png

quattro: icons for attachments

2012-02-15 11:10:02 +01:00

delete.png

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

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

edit.png

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

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

feed.png

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

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

gear.png

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

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

group.png

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

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

image.png

quattro: icons for attachments

2012-02-15 11:10:02 +01:00

info.png

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

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

link.png

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

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

lock.png

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

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

menu.png

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

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

notice.png

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

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

notify_off.png

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

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

notify_on.png

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

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

play.png

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

star.png

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

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

text.png

quattro: icons for attachments

2012-02-15 11:10:02 +01:00

unlock.png

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

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

user.png

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

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

video.png

quattro: icons for attachments

2012-02-15 11:10:02 +01:00

zip.png

quattro: icons for attachments

2012-02-15 11:10:02 +01:00