]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
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)
commit1f87e77701352c297918b21fc082ae96d0ca3b2c
treeed36228e6a78187db85d75fe668f6d04a5ae8d4b
parent5eb6c0d73132a4fb408aca8ce88e4f75e1e79997
parent0b1d8762c6f0739052dc074152a9d7ec119c33fe
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* '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