2 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
Simon L'nu	2c43120129	dispy-dark not experimental. start implementing fpostit ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 03:22:16 -04:00