]> git.mxchange.org Git - friendica.git/commit
missed merge conflict tag
authorFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:26:04 +0000 (01:26 -0700)
committerFriendika <info@friendika.com>
Mon, 4 Apr 2011 08:26:04 +0000 (01:26 -0700)
commit94881c15d38d8e02b736060e9707643c56c58ea0
treeb159b68548c57309e95c48564a702558053d3ceb
parent379af2521559c263622348bce41872b61067e532
missed merge conflict tag
mod/dfrn_poll.php