Merge branch 'master' into 30-application-security-gateway

# Conflicts: # passbook/core/policies.py # passbook/core/settings.py
2019-03-21 14:58:10 +01:00
parent 6be8d0cbb2 1c3b5889e5
commit 10b7d99b37
37 changed files with 221 additions and 56 deletions
--- a/passbook/lib/init.py
+++ b/passbook/lib/init.py
@ -1,2 +1,2 @@
 """passbook lib"""
-__version__ = '0.1.23-beta'
+__version__ = '0.1.24-beta'
--- a/passbook/lib/default.yml
+++ b/passbook/lib/default.yml
@ -30,6 +30,7 @@ debug: false
 secure_proxy_header:
  HTTP_X_FORWARDED_PROTO: https
 rabbitmq: guest:guest@localhost/passbook
+redis: localhost/0
 # Error reporting, sends stacktrace to sentry.services.beryju.org
 error_report_enabled: true
 secret_key: 9$@r!d^1^jrn#fk#1#@ks#9&i$^s#1)_13%$rwjrhd=e8jfi_s