]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/ExtendedProfile/actions/profiledetailsettings.php
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
authorZach Copley <zach@status.net>
Wed, 16 Mar 2011 23:09:50 +0000 (16:09 -0700)
committerZach Copley <zach@status.net>
Wed, 16 Mar 2011 23:09:50 +0000 (16:09 -0700)
commite7843dfda277e10904caf6e8212928f7ec271009
treeb3e7db3da1a3c0606f031c30d89aa6533baf9921
parent88d31a793398fca66b50e588c573153b8d402da6
parent0182b96f7cd1b03f740fe6ed788a0cf36d1b8487
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x