summaryrefslogtreecommitdiff
path: root/config/defaults.yml
diff options
context:
space:
mode:
authorMarie <ml.kochsiek@fu-berlin.de>2016-09-23 13:47:50 +0000
committerGitHub <noreply@github.com>2016-09-23 13:47:50 +0000
commita5958e51fbf106fa841a7aca444b705600714585 (patch)
tree59c5d1f0e62440a22e90a45fface4e3dfc48b45e /config/defaults.yml
parent782be39862394c05a069eab9b7dd8f6779354917 (diff)
parenta7ab66b0478c1845ed0fdbff7dd3c83ea804826c (diff)
Merge pull request #16 from LoadToCode/temp_1_marie
Temp 1 marie
Diffstat (limited to 'config/defaults.yml')
-rw-r--r--config/defaults.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/defaults.yml b/config/defaults.yml
index bcb8dac..7e2ea58 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -32,7 +32,6 @@ common: &common
pagination_size: 30
auth:
token_expires_after: 60
-
# handles that will be blocked from being used as logins or email aliases
# in addition to the ones in /etc/passwd and http://tools.ietf.org/html/rfc2142
handle_blacklist: