]> 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: 5eb6c0d 0b1d876)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
authorZach Copley <zach@status.net>
Thu, 15 Sep 2011 16:30:52 +0000 (09:30 -0700)
committerZach Copley <zach@status.net>
Thu, 15 Sep 2011 16:30:52 +0000 (09:30 -0700)
* 'testing' of gitorious.org:statusnet/mainline:
  include q as param, not arg for search sub menu
  exact match for paths
  change category on urlmapper.php


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. :-)