]> git.mxchange.org Git - friendica-addons.git/commitdiff
projects / friendica-addons.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5f3080 3b2cf61)
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 04:00:38 +0000 (00:00 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 04:00:38 +0000 (00:00 -0400)
* remotes/upstream/master:
  provide optional sitewide channel list
  improved irc with some alternate channel selections

* master:


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