aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-03-28 14:45:48 +0000
committerColin Guthrie <colin@mageia.org>2014-03-28 14:45:48 +0000
commit057c9182c2ae2674e5e9926857594f29fbc0a7ea (patch)
tree1be4d87113c0af4c2b56b38fa81e687324c5d695
parentd4b29a99bff98b154fdacdb21fa79b8eaab283cb (diff)
parentfe4e12677edc10061a1bd7c3bc180375d7e61ba3 (diff)
downloadidentity-057c9182c2ae2674e5e9926857594f29fbc0a7ea.tar
identity-057c9182c2ae2674e5e9926857594f29fbc0a7ea.tar.gz
identity-057c9182c2ae2674e5e9926857594f29fbc0a7ea.tar.bz2
identity-057c9182c2ae2674e5e9926857594f29fbc0a7ea.tar.xz
identity-057c9182c2ae2674e5e9926857594f29fbc0a7ea.zip
Merge branch 'master' into topic/production
-rw-r--r--catdap.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/catdap.yml b/catdap.yml
index dd82ea8..ba1c46f 100644
--- a/catdap.yml
+++ b/catdap.yml
@@ -32,7 +32,7 @@ Model::User:
start_tls: 1
register:
- login_regex: ^[a-z][a-z0-9_-]*$
+ login_regex: ^[a-z][a-z0-9]*$
login_blacklist:
- apache