Files
webvirtcloud/instances/templates/instance.html
Daniel Rieper 29b722ff41 Merge branch 'master' of https://github.com/honza801/webvirtcloud
Conflicts:
	instances/templates/instance.html
	instances/views.py
2016-07-29 13:05:54 +02:00

99 KiB