diff options
Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
Diffstat (limited to 'bin/OpenSim.ConsoleClient.exe.config')
0 files changed, 0 insertions, 0 deletions