]> git.mxchange.org Git - friendica-addons.git/commit
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)
commitd1638405a00d93f73103103af284b6f7bdc0329f
treeda3011e3d2874a38ea346085f9f85cc7aeadd678
parente5f3080f9c520739bd2661410439f9d2d0ce067a
parent3b2cf61a554bd852aed0bfafc37dc2b14ee83729
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  provide optional sitewide channel list
  improved irc with some alternate channel selections

* master: