Merge develop into master - #425

Merged

OmarIthawi merged 13 commits into

appsembler/tahoe/masterfrom

appsembler/tahoe/develop

Jul 11, 2019

Commits on Jun 25, 2019

Avoid tokens of trusted web clients after a password reset
OmarIthawi
committed
ce20e16

Commits on Jul 2, 2019

set up caching on TravisCI
thraxil
committed
54aa20e
Multi-site aware enrollments and courses API (#397)
johnbaldwin
authored
7fbb26a
Merge pull request #398 from appsembler/omar/avoid-removing-amc-tokens
OmarIthawi
authored
efddb46
Use a safe default for KEEP_TRUSTED_CONFIDENTIAL_CLIENT_TOKENS
OmarIthawi
committed
d72c137
Merge pull request #416 from appsembler/omar/feature-fixup
OmarIthawi
authored
0ccaae0
Revert "Update translations (autogenerated message)"
OmarIthawi
committed
4dc0a49
Revert "Update translations (autogenerated message)"
OmarIthawi
committed
f1cc004
Merge pull request #417 from appsembler/omar/i18n-revert
OmarIthawi
authored
deec836

Commits on Jul 8, 2019

fix some pep8 regressions
thraxil
committed
2d8d657

Commits on Jul 10, 2019

Update translations (autogenerated message)
OmarIthawi
committed
acbfd67
Merge pull request #424 from appsembler/omar/psac-fr_CA
OmarIthawi
authored
6e12bbf

Commits on Jul 11, 2019

Tahoe API - Fixed enrollment so that "unenroll" returns error (#421)
johnbaldwin
authored
1afe100