Levi 9333532662 Merge branch 'master' into develop		2017-06-13 14:07:52 -05:00
..
locale/de/LC_MESSAGES	Merge branch 'master' into develop	2017-06-13 14:07:52 -05:00
migrations	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
static/datacenterlight	Fix conflicts	2017-06-13 10:36:39 -05:00
templates/datacenterlight	Merge branch 'master' into develop	2017-06-13 14:07:52 -05:00
__init__.py
admin.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
apps.py
forms.py	Show modal after beta access signup	2017-05-22 18:03:33 +02:00
models.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
tests.py
urls.py	Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before.	2017-06-07 02:02:31 +05:30
views.py	Merge branch 'master' into develop	2017-06-13 14:07:52 -05:00