]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 14 Apr 2012 19:12:39 +0000 (15:12 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 14 Apr 2012 19:12:39 +0000 (15:12 -0400)
commit1dd22be4d2fe997d9bde552f8d8a25ba12c67e7e
tree32486e253628ab64fa466f34dfc0703d9ce8644c
parent16f729912a00cc92d0473f3d326080531a2fb393
parent6591b292a1e22e3eaec41af0a61a6911e9847098
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bogus empty list element in dfrn_request page when emailnet not enabled
  zrl on random profile
  zrl hook
  bug #372 - category feeds
  pass zrl's to/through global directory

* master: