diff options
author | Zach Copley <zach@status.net> | 2010-01-27 14:14:18 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-01-27 14:14:18 -0800 |
commit | 2494d3fa25a44b3cacf85c594683675ae9e6d0cb (patch) | |
tree | 3801a02cb56a87178d9544a3fc570c95169fa4f9 /actions/groupblock.php | |
parent | b0a325f7d0418575cdb46b7074c4cd2317f04980 (diff) | |
parent | 9a54745fcd252e27cc664da7cee67b48d0f4f501 (diff) |
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline:
Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
Add new oauth tables and modifications to 'consumer' table for rc4
Diffstat (limited to 'actions/groupblock.php')
0 files changed, 0 insertions, 0 deletions