]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47429a3 e81e7f7)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:39:04 +0000 (10:39 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 2 Mar 2012 15:39:04 +0000 (10:39 -0500)
* remotes/upstream/master:
  blockem: fix to work with changed 'display_item' hook

* master:


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