Merge branch 'cleanup_db_after_functest' of github.com:thiagol11/swiftonfile into cleanup_db_after_functest
Conflicts: test/functional/__init__.py
This commit is contained in:
commit
408ad0f047
Conflicts: test/functional/__init__.py