]> git.mxchange.org Git - friendica-addons.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 02:09:20 +0000 (21:09 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 28 Feb 2012 02:09:20 +0000 (21:09 -0500)
commit916d609cbba6a88bf4fe47b795c789eeb93e8b74
treee1bdc81ad675f4cba64e6184c6dfca66df6d0914
parent57295cffa0af8b68f820d6b93074b347f692975c
parentbce0e4f5a0e0d1bd72c5511cb284ee8e334ccd18
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add gnot plugin

* master: