1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2025-07-31 12:41:08 +00:00

Merge remote-tracking branch 'retspen/master'

Conflicts:
	conf/requirements.txt
This commit is contained in:
Jan Krcmar 2016-04-21 13:34:27 +02:00
commit db1ab88f51
11 changed files with 456 additions and 415 deletions

View file

@ -103,7 +103,7 @@ def instances(request):
conn.start(name)
addlogmsg(request.user.username, instance.name, msg)
return HttpResponseRedirect(request.get_full_path())
if 'getvvfile' in request.POST:
msg = _("Send console.vv file")
addlogmsg(request.user.username, instance.name, msg)