Commit graph

5 commits

Author SHA1 Message Date
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
Fabio Comuni ef34847501 templates: fix tags 2012-03-02 12:41:34 +01:00
Fabio Comuni ed42fa7d59 conversation: remove templating items in code and move it to template. 2012-03-01 11:46:08 +01:00
Michael edc44933a4 "Vier-Theme" Some more design stuff. 2012-02-26 21:16:29 +01:00
ike 73e0e4d783 New theme "vier" derives from "quattro" 2012-02-19 20:05:51 +01:00