]> git.mxchange.org Git - friendica.git/commit
Merge branch 'chriscase-master'
authorFriendika <info@friendika.com>
Sun, 20 Feb 2011 09:42:11 +0000 (01:42 -0800)
committerFriendika <info@friendika.com>
Sun, 20 Feb 2011 09:42:11 +0000 (01:42 -0800)
commitaf0fe4cf422aee9a8fd6b5b5cd422ed0c02e6696
tree94ed0dfa2195a92bb39f135afa3161d36d2d90c6
parent3d1b153decac09a4e1f25fdea9d381f8f1770e2f
parent9260bb4ce15f172485d3c0765b2a14aaaf77cd0b
Merge branch 'chriscase-master'

Conflicts:
mod/dfrn_notify.php