]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - actions/userbyid.php
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 11:25:07 +0000 (06:25 -0500)
committerEvan Prodromou <evan@status.net>
Tue, 17 Nov 2009 11:25:07 +0000 (06:25 -0500)
commit6a1afda259c5223449f679a64f932e36df5ebe39
tree7d754e8a1b7734c6750ca84b28ba0e93213e0a86
parentd59af0296070cd868855564a0280e4be2c16410d
parent75c00f0054c08c7b49515c849260afbb6913f525
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
classes/statusnet.ini
classes/Profile.php
classes/User.php
classes/statusnet.ini
plugins/UserFlag/UserFlagPlugin.php