Merge branch 'Timeline-jduran' into Timeline-jreid

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

1 files changed, 2 insertions, 1 deletions

diff --git a/js/panels/Timeline/Tween.reel/Tween.html b/js/panels/Timeline/Tween.reel/Tween.html
index 3e72acc0..307dcd02 100644
--- a/js/panels/Timeline/Tween.reel/Tween.html
+++ b/js/panels/Timeline/Tween.reel/Tween.html
@@ -28,7 +28,8 @@
                             "module": "js/panels/Timeline/Keyframe.reel",
                             "name": "Keyframe",
                             "properties": {
-                                "element": {"#": "keyframe_container"}
+                                "element": {"#": "keyframe_container"},
+                                "containingSpan": {"@": "span"}
                             }
                         }
                     }