]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 00:06:02 +0000 (19:06 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 7 Mar 2012 00:06:02 +0000 (19:06 -0500)
commitd89cd6569bac3d157870b478b41f72c8958ea382
tree9bb9f515c571d361b9e16f6ef6a308f4ffac5ed2
parentc4c98a998827fb0ec49d5b40d3e4439aa9146e24
parentfdd269228b159709f5d0f3cf9bb7a23d2c046255
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  improved smiley transparency

* master: