Revision d4e4e501
ID | d4e4e5011265395421aa35b5bae61e4472d76fab |
Merge branch 'hotfix-0.14.3' into develop
Conflicts:
Changelog
snf-astakos-app/astakos/im/messages.py
snf-pithos-app/pithos/api/manage_accounts/__init__.py
snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py
snf-pithos-app/pithos/api/settings.py
snf-pithos-app/pithos/api/util.py
snf-pithos-backend/pithos/backends/lib/sqlite/node.py
version
Files
- added
- modified
- copied
- renamed
- deleted