Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-02-03 15:45:17 +01:00
commit 74f22791d8
10 changed files with 241 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/settings_default.py
View file

@ -831,9 +831,9 @@ AUTH_USERNAME_VALIDATORS = [
{'NAME': 'evennia.server.validators.EvenniaUsernameAvailabilityValidator'}]
# Use a custom test runner that just tests Evennia-specific apps.
TEST_RUNNER = 'evennia.server.tests.EvenniaTestSuiteRunner'
TEST_RUNNER = 'evennia.server.tests.testrunner.EvenniaTestSuiteRunner'
# Messages and Bootstrap don't classify events the same way; this setting maps
# Messages and Bootstrap don't classify events the same way; this setting maps
# messages.error() to Bootstrap 'danger' classes.
MESSAGE_TAGS = {
messages.ERROR: 'danger',