]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9860d6b 37801dd)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 04:03:30 +0000 (00:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 5 Apr 2012 04:03:30 +0000 (00:03 -0400)
* remotes/upstream/master:
  also block outbound
  let's catch d* disabled at a higher level and not waste any resources on it.

* master:


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