]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
projects / quix0rs-gnu-social.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9ace57 8a87e98)
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)
* 'master' of gitorious.org:statusnet/mainline:
  Show aside primary on settings pages for all themes.
  correct error in README on default for deletion


Trivial merge
This is my personal clone from the wonderful software GNUSocial. I may fix or break things here, so use it on your own risk. :-)