diff options
| author | Brion Vibber <brion@pobox.com> | 2010-04-10 17:56:11 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-04-10 17:56:11 -0700 |
| commit | 1eeb23e1e3b77de056791a74cd3e4f5c02d68510 (patch) | |
| tree | a636518ebfc9bf41c2b0b0a916c14f1ee37df634 /file | |
| parent | af06c554a0d8c4eeab801a9550d951845d40350a (diff) | |
| parent | edd883d3b009788049a9326bd6bdcc7846f87a8a (diff) | |
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
actions/confirmaddress.php
Diffstat (limited to 'file')
0 files changed, 0 insertions, 0 deletions