]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch 'master' of gitorious.org:statusnet/mainline
authorZach Copley <zach@status.net>
Thu, 10 Feb 2011 18:26:36 +0000 (10:26 -0800)
committerZach Copley <zach@status.net>
Thu, 10 Feb 2011 18:26:36 +0000 (10:26 -0800)
commit857e35c17566cf05d670b3dd27128842ba97eaf7
treea6c1bbc3becb666e5ce90bf118ce311d56c743eb
parentd9ace57625bebd1205ab3348db7097e74b8c6d24
parent8a87e9869f5a4e61592bd4f44a9ed6e208a3151d
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