Arvind Tiwari 2a71be354b conflicts resolved		2017-10-17 00:27:50 +05:30
..
locale/de/LC_MESSAGES	conflicts resolved	2017-10-17 00:27:50 +05:30
management
migrations	Added vmdetail migration file	2017-09-25 00:36:33 +05:30
static/hosting	conflicts resolved	2017-10-17 00:27:50 +05:30
templates/hosting	conflicts resolved	2017-10-17 00:27:50 +05:30
__init__.py
admin.py
forms.py	Return if the form already contains error	2017-10-14 12:52:18 +02:00
managers.py
mixins.py
models.py	merged master	2017-10-03 18:42:00 +05:30
README-opennebula-integration.md
test_forms.py
test_models.py
test_views.py
tests.py
urls.py	alignment fix	2017-10-03 18:18:18 +05:30
views.py	conflicts resolved	2017-10-17 00:27:50 +05:30