diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-28 13:52:01 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-28 13:52:01 +0000 |
| commit | 4b3f022fc2ff142e6d1cb6740b7f89108cfda292 (patch) | |
| tree | a7e0f0e6730a02e6a2fc6196bbeabcb1b932baae /actions/doc.php | |
| parent | 420c3613049bec1360cdeb1f50283b239adf23d3 (diff) | |
| parent | 8c073a34ce472fc8d0385659a222339a5ba4254a (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:
lib/jabber.php
Diffstat (limited to 'actions/doc.php')
0 files changed, 0 insertions, 0 deletions