diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to 'OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs')
0 files changed, 0 insertions, 0 deletions