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

..

dark

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

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

green

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

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

comment_item.tpl

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

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

config.php

quattro: move quattro-green inside quattro folder.

2012-03-30 21:21:14 +02:00

contact_template.tpl

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

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

conversation.tpl

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

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

experimental

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

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

fileas_widget.tpl

quattro: tpl for "file as"

2012-03-28 13:37:04 +02:00

group_side.tpl

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

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

icons.less

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

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

jot.tpl

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

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

mail_conv.tpl

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

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

mail_display.tpl

quattro: style pm pages

2012-03-28 15:34:02 +02:00

mail_list.tpl

quattro: style pm pages

2012-03-28 15:34:02 +02:00

message_side.tpl

quattro: style pm pages

2012-03-28 15:34:02 +02:00

msg-header.tpl

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

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

nav.tpl

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

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

nets.tpl

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

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

profile_vcard.tpl

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

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

quattro.less

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

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

saved_searches_aside.tpl

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

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

screenshot.jpg

quattro: move quattro-green inside quattro folder.

2012-03-30 21:21:14 +02:00

search_item.tpl

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

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

style.php

quattro: move quattro-green inside quattro folder.

2012-03-30 21:21:14 +02:00

theme_settings.tpl

quattro: move quattro-green inside quattro folder.

2012-03-30 21:21:14 +02:00

theme.php

quattro: add config.php

2012-03-30 15:45:23 +02:00

wall_item.tpl

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

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

wallwall_item.tpl

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

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