Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs |
||
|---|---|---|
| .. | ||
| LoadRegions | ||
| RegionModulesController | ||
| RemoteController | ||
| Rest | ||
Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs |
||
|---|---|---|
| .. | ||
| LoadRegions | ||
| RegionModulesController | ||
| RemoteController | ||
| Rest | ||