]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - classes/User_im_prefs.php
Merge branch '0.9.x' into 1.0.x
authorBrion Vibber <brion@pobox.com>
Fri, 7 May 2010 01:49:01 +0000 (18:49 -0700)
committerBrion Vibber <brion@pobox.com>
Fri, 7 May 2010 01:49:01 +0000 (18:49 -0700)
commitd9c1ac9053ee3e4ddb861d1467bb065a4bfab3bf
treee54220748cb5f22abfe555c69b9f46f567cb2933
parent3e8af172d636cc7ca3a9e2301b928f6ca79b9eb2
parentd57e1deaec7406c63f70b8a5664746d18c1125ff
Merge branch '0.9.x' into 1.0.x