52 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	be2005f146	quattro: move quattro-green inside quattro folder. ... Add config option to select quattro color scheme.	2012-03-30 21:21:14 +02:00