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
Tony Baldwin	1ae740535d	added slack-NS, non-scrolly, slackr-based theme.	2012-03-13 23:05:04 -04:00