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

..

border.jpg

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

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

head.jpg

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

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

screenshot.jpg

screenshot gallery

2012-03-25 20:08:28 -07:00

sectionend.jpg

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

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

shiny.png

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

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

style.css

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

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

theme.php

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

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