]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
authorIan Denhardt <ian@zenhack.net>
Mon, 20 Dec 2010 20:17:31 +0000 (15:17 -0500)
committerIan Denhardt <ian@zenhack.net>
Mon, 20 Dec 2010 20:19:33 +0000 (15:19 -0500)
commite36399974e6ccd1ee3e53bfffa3c34edaf8bd488
tree6f80b17737776547ea743b85a124a28d8bce126e
parent46e5df0996fef4c9b5e3bfb79af1cbff412dca01
parentd8a3a88ec8eae3134694c98e5a9ae42bc30b289f
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline

Conflicts:
lib/action.php
plugins/OStatus/actions/ostatusinit.php
doc-src/about
doc-src/faq
lib/action.php
plugins/OStatus/actions/ostatusinit.php