Revision 1baa9737
| ID | 1baa9737e7ad222b871c7f3ffd7816ac70fcffa6 |
Merge branch 'tmp-pithos-tests' of https://code.grnet.gr/git/synnefo into tmp-pithos-tests
Conflicts:
snf-astakos-app/astakos/api/tokens.py
snf-astakos-app/astakos/im/tests/api.py
snf-common/synnefo/settings/test.py
snf-django-lib/snf_django/lib/api/__init__.py
snf-django-lib/snf_django/utils/testing.py
snf-pithos-app/pithos/api/functions.py
snf-pithos-app/pithos/api/settings.py
snf-pithos-app/pithos/api/test/__init__.py
snf-pithos-app/pithos/api/test/accounts.py
snf-pithos-app/pithos/api/test/containers.py
snf-pithos-app/pithos/api/tests.py
snf-pithos-app/pithos/api/util.py
Files
- added
- modified
- copied
- renamed
- deleted