]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 9 Mar 2012 04:59:43 +0000 (23:59 -0500)
commit20b2090182dc2a62adcbfb0ff844574e0596756d
treed4ab9e8726647014d886172c9421709701d77151
parent8d19baadffaf38a563a3ad1052180bcb142eb564
parente25fb2b2f9a822fa7180448ddff7f558dfc34fee
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  removed info
  add info
  fixed star-bug
  More improved transparency for smilies
  removed dolphin file (wtf?)
  .

* master: