Levi 89dedab8ba resolved henry latest conflicts		2017-06-13 01:12:51 -05:00
..
locale/de/LC_MESSAGES	Merge branch 'master' into develop	2017-06-12 23:51:03 -05:00
migrations	Manual merge of ungleich/master into opennebula-integration	2017-04-24 03:01:05 +05:30
static/datacenterlight	resolved henry latest conflicts	2017-06-13 01:12:51 -05:00
templates/datacenterlight	Merge branch 'master' into develop	2017-06-12 23:51:03 -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	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-12 23:51:03 -05:00