diff options
Merge branch 'master' into careminster-presence-refactor
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to 'OpenSim/Region/DataSnapshot/Interfaces/IDataSnapshotProvider.cs')
0 files changed, 0 insertions, 0 deletions