Merge branch 'master' into httptests

This commit is contained in:
UbitUmarov
2016-11-27 15:14:34 +00:00
47 changed files with 645 additions and 318 deletions

View File

@@ -473,7 +473,7 @@
;region_manager_is_god = false
; Allow parcel owners to assume god powers in their parcels
; you really may not want this...
; you really do not want this...
;parcel_owner_is_god = false
; Control user types that are allowed to create new scripts