diff options
| author | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-06-07 10:19:40 -0700 |
| commit | d88b208edcb75ec864e09bb3ab29785b35064400 (patch) | |
| tree | 6a3b2eb35fb792bffb7ebaf3b4f81fb1131466d1 /actions/imsettings.php | |
| parent | a7e33ac89df9f05b7497bfb34c6e69b3329a87e5 (diff) | |
| parent | 41e9dba7297d43b7de0cb7665901869910d1047a (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OpenID/openid.php
Diffstat (limited to 'actions/imsettings.php')
0 files changed, 0 insertions, 0 deletions