Revision 4a669c71
| ID | 4a669c711b7baf8c71cdde46959eb05cb7221ad9 |
| Parent | f388beb9 |
| Child | ad788af8 |
Fixed additional conflicts from previous merge
Files
- added
- modified
- copied
- renamed
- deleted
- docs
- snf-pithos-app
- pithos
- api
- synnefo_settings.py (diff)
- ui
- __init__.py
- settings.py
- urls.py
- pithos
- snf-pithos-backend