Merge branch 'master' into 0.5

diff --git a/snf-astakos-app/Changelog b/snf-astakos-app/Changelog
index 77fa21b..7d706a5 100644 (file)
--- a/snf-astakos-app/Changelog
+++ b/snf-astakos-app/Changelog
@@ -1,11 +1,11 @@
-v0.3.7
+v0.3.8
 ======
 
 - New ASTAKOS_PROFILE_EXTRA_LINKS setting to display additional buttons on
   account pages.
 
 
-v0.3.6
+v0.3.7
 ======
 
 - New ASTAKOS_LOGIN_MESSAGES setting to display messages on the login page

diff --git a/snf-astakos-app/astakos/im/settings.py b/snf-astakos-app/astakos/im/settings.py
index 83acfec..1dd643b 100644 (file)
--- a/snf-astakos-app/astakos/im/settings.py
+++ b/snf-astakos-app/astakos/im/settings.py
@@ -64,7 +64,7 @@ RECAPTCHA_ENABLED = getattr(settings, 'ASTAKOS_RECAPTCHA_ENABLED', True)
 BILLING_FIELDS = getattr(settings, 'ASTAKOS_BILLING_FIELDS', ['is_active'])
 
 # Queue for billing.
-QUEUE_CONNECTION = getattr(settings, 'ASTAKOS_QUEUE_CONNECTION', None) # Example: 'rabbitmq://guest:guest@localhost:5672/astakos.*'
+QUEUE_CONNECTION = getattr(settings, 'ASTAKOS_QUEUE_CONNECTION', None) # Example: 'rabbitmq://guest:guest@localhost:5672/astakos'
 
 # Set where the user should be redirected after logout
 LOGOUT_NEXT = getattr(settings, 'ASTAKOS_LOGOUT_NEXT', '')