merging changes

2011-10-08 13:09:51 +00:00 · 2011-10-08 13:09:51 +00:00 · f031041dcf
commit f031041dcf
parent 63f6ed6d49 5f025c4948
1 changed files with 4 additions and 0 deletions
--- a/pandora/monkey_patch/models.py
+++ b/pandora/monkey_patch/models.py
@ -1,6 +1,10 @@
 from django.contrib.auth.models import User
 from django.core.validators import MaxLengthValidator

+#load config from json
+import app.models
+app.models.load_config()
+
 NEW_USERNAME_LENGTH = 255

 def monkey_patch_username():