Skip to content

Commit

Permalink
Merge branch 'cherry_5584' into '5.5.z'
Browse files Browse the repository at this point in the history
SPICE: Add missing compatibility file for IE10.

https://bugzilla.redhat.com/show_bug.cgi?id=1279357

5.5 BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1289247

clean cherry-pick, upstream PR: ManageIQ#5584

See merge request !546
  • Loading branch information
Dan Clarizio committed Dec 7, 2015
2 parents e19a792 + 94e8f75 commit ba1c2b2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/views/vm_common/console_spice.html.haml
Expand Up @@ -11,7 +11,7 @@
'spiceHTML5/spiceconn', 'spiceHTML5/display', 'spiceHTML5/main', 'spiceHTML5/inputs',
'spiceHTML5/cursor', 'spiceHTML5/thirdparty/jsbn', 'spiceHTML5/thirdparty/rsa',
'spiceHTML5/thirdparty/prng4', 'spiceHTML5/thirdparty/rng', 'spiceHTML5/thirdparty/sha1',
'spiceHTML5/ticket', 'spice-html5'
'spiceHTML5/ticket', 'spiceHTML5/spicearraybuffer', 'spice-html5'
- if Rails.env.development?
= javascript_include_tag 'miq_debug'

Expand Down

0 comments on commit ba1c2b2

Please sign in to comment.