From: Zach Copley Date: Thu, 10 Feb 2011 18:26:36 +0000 (-0800) Subject: Merge branch 'master' of gitorious.org:statusnet/mainline X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=857e35c17566cf05d670b3dd27128842ba97eaf7;p=quix0rs-gnu-social.git Merge branch 'master' of gitorious.org:statusnet/mainline * 'master' of gitorious.org:statusnet/mainline: Show aside primary on settings pages for all themes. correct error in README on default for deletion --- 857e35c17566cf05d670b3dd27128842ba97eaf7