]> git.mxchange.org Git - friendica.git/commit
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)
commit78280bdfed363f2316f1fa4e854e9604ebd58470
tree349bd483ccf265bef6216c041a4e4c3b587b357b
parent1a1efc7e4614a50a6221e17f0bb4ca48b6d38642
parentc9e5609cbfd89db35b536a22eb2ce6cbf7992783
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* 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: