diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-01 14:40:58 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-01 14:40:58 -0400 |
| commit | 3bec08c878d50cfa43ffb72466842bda5dd88171 (patch) | |
| tree | abb5c38a0567dfb9af37c68801832b8bb56e9335 /actions/smssettings.php | |
| parent | 783d292739886811ab41215c614940d24214358f (diff) | |
| parent | e7381493ad036e686f82f432066f00ff911ad5d5 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev
Conflicts:
README
lib/router.php
Diffstat (limited to 'actions/smssettings.php')
0 files changed, 0 insertions, 0 deletions