diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-27 14:57:32 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-27 14:57:32 -0700 |
| commit | 696aeea113b88fd0f6b7c4c88eebc2f4f369d245 (patch) | |
| tree | c16f91a270c2989f8e6b3799b2dfa3e39698f565 /plugins/Blacklist | |
| parent | cc25ec175530a691686087db4c23a1a28ffd1b62 (diff) | |
| parent | 2f2fa100715f9c09b2b91a2d1afddacf7b7f16db (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
lib/language.php
plugins/OpenID/finishaddopenid.php
Diffstat (limited to 'plugins/Blacklist')
0 files changed, 0 insertions, 0 deletions