]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0776b11 1477009)
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)
* remotes/upstream/master:
  adult_smile addon
  updating packages
  fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway)

* master:


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