Manual merge of ungleich/master into opennebula-integration
This commit is contained in:
parent
d10285e23d
commit
d537fcb118
227 changed files with 25682 additions and 478 deletions
BIN
hosting/locale/de/LC_MESSAGES/django.mo
Normal file
BIN
hosting/locale/de/LC_MESSAGES/django.mo
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue