Henry Bravo c69694274f Fix conflicts		2017-06-05 14:55:41 -05:00
..
locale/de/LC_MESSAGES	Fix conflicts	2017-06-05 14:55:41 -05:00
migrations	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
static/datacenterlight	Add input fields (email, name) in Calculator (Pricing page)	2017-06-05 14:30:41 -05:00
templates/datacenterlight	Add input fields (email, name) in Calculator (Pricing page)	2017-06-05 14:30:41 -05:00
__init__.py	added datacenterlight	2016-12-20 18:05:20 -05:00
admin.py	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
apps.py	added datacenterlight	2016-12-20 18:05:20 -05:00
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	added datacenterlight	2016-12-20 18:05:20 -05:00
urls.py	resolve conflicts	2017-05-23 12:13:44 -05:00
views.py	Removed a bogus call to languages() method that caused no showing of the VM templates	2017-05-30 12:20:13 +05:30