diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
| commit | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (patch) | |
| tree | 559729d3330991c0c68da96350b71434ca4f6f87 /actions/imsettings.php | |
| parent | a389f157baddafa91347c27194805580b1373e30 (diff) | |
| parent | 13c183e2f4e0738233658ca79103bbe4a6d57992 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:
lib/util.php
Diffstat (limited to 'actions/imsettings.php')
0 files changed, 0 insertions, 0 deletions