diff options
| author | Melanie | 2010-08-10 20:11:55 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-10 20:11:55 +0100 |
| commit | 24b9a2885f1204d32cd032aa8ea9905fa9ce19b1 (patch) | |
| tree | 21848b27494c70e7652bff8871f1c7101c5196c1 /OpenSim/Services/UserAccountService | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| download | opensim-SC-24b9a2885f1204d32cd032aa8ea9905fa9ce19b1.zip opensim-SC-24b9a2885f1204d32cd032aa8ea9905fa9ce19b1.tar.gz opensim-SC-24b9a2885f1204d32cd032aa8ea9905fa9ce19b1.tar.bz2 opensim-SC-24b9a2885f1204d32cd032aa8ea9905fa9ce19b1.tar.xz | |
Resolve merge issues
Diffstat (limited to 'OpenSim/Services/UserAccountService')
0 files changed, 0 insertions, 0 deletions