]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a1efc7 c9e5609)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 25 Apr 2012 17:47:20 +0000 (13:47 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 25 Apr 2012 17:47:20 +0000 (13:47 -0400)
* remotes/upstream/master:
  bug #307, explaining decentralised private photos is impossible.
  this turns out to be harder than I thought
  cleanup - make bb-buttons vanish when comment closed
  Esperanto at 100% again

* master:


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