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 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Fabio Comuni 16d45e5c13 quattro: first work on jot style 2011-12-19 18:02:43 +01:00
Tobias Diekershoff 2650ba49c1 video button only for dispy and quattro 2011-10-17 07:48:33 +02:00
Tobias Diekershoff 0fb119496e some work on quattro theme 2011-10-12 07:47:41 +02:00