]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16f7299 6591b29)
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)
* 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:


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.