]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 14 Mar 2012 03:44:46 +0000 (23:44 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 14 Mar 2012 03:44:46 +0000 (23:44 -0400)
commit634183ac2f92527afda478b2c75c7c374c64fe78
tree5e941c07bd931a8cc334dabead2c91e6252a9c3b
parent0776b11f6e2ae2309db1bbc1b8cf16213ce8240e
parent14770093d95a67871a8a75695f3dd748da9b79bd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  adult_smile addon
  updating packages
  fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway)

* master: