]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce21d93 71ad01e)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 22:30:44 +0000 (18:30 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 18 Mar 2012 22:30:44 +0000 (18:30 -0400)
* remotes/upstream/master:
  added comments and link to documentation to irc.php

* master:


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