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

..

calendar.png

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

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

colors.less

…

contact_template.tpl

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

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

icons.less

…

icons.png

…

icons.svg

…

nav.tpl

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

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

quattro.less

…

screenshot.jpg

…

search_item.tpl

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

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

style.css

…

style.less

…

wall_item.tpl

…

wallwall_item.tpl

…