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
..
create_inst_block.html	Fix typos	2016-06-02 13:47:48 +02:00
instance.html	Merge branch 'master' of https://github.com/honza801/webvirtcloud	2016-07-29 13:05:54 +02:00
instances.html	instances_filter cookie expires after 1 day	2016-05-06 14:40:24 +02:00