diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-06-16 00:59:57 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-06-16 00:59:57 -0700 |
commit | ab10db9bd10abbc02a44d5d36d68626530d2694e (patch) | |
tree | cbd5e2253a59beb6c372603a4d4f9c8f25e2b553 /actions/emailsettings.php | |
parent | 2ccf43d65682134433d6f420e1bb41d16b4b8e4c (diff) | |
parent | c98179378be7c8903a6ba7a9fe37bf6683219555 (diff) |
Merge branch '0.8.x' into userdesign
* 0.8.x:
Revert "Using neutral colour for notice hover"
Using neutral colour for notice hover
forgot to disinherit Memcached_DataObject in Status_network
Add some basic memcached handling to status_network
Diffstat (limited to 'actions/emailsettings.php')
0 files changed, 0 insertions, 0 deletions