diff options
| author | Jon Reid | 2012-04-26 13:13:17 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-04-26 13:13:17 -0700 |
| commit | ddbc1ac7eb35fee9254f4842fe29ab35de3d214c (patch) | |
| tree | 3cfacd0f4714e929584e7bb915dfd3613fb74226 /js/controllers/elements/stage-controller.js | |
| parent | 47e63e06fe01a1d66d3909b5f6acc0d987f97d9d (diff) | |
| parent | 53eba0fe1bd27396a8b7cb7828e51457d8d9576a (diff) | |
| download | ninja-ddbc1ac7eb35fee9254f4842fe29ab35de3d214c.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/controllers/elements/stage-controller.js')
| -rwxr-xr-x | js/controllers/elements/stage-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/controllers/elements/stage-controller.js b/js/controllers/elements/stage-controller.js index 3ef7dacc..e9779c81 100755 --- a/js/controllers/elements/stage-controller.js +++ b/js/controllers/elements/stage-controller.js | |||
| @@ -182,5 +182,5 @@ exports.StageController = Montage.create(ElementController, { | |||
| 182 | return dist; | 182 | return dist; |
| 183 | } | 183 | } |
| 184 | } | 184 | } |
| 185 | }, | 185 | } |
| 186 | }); | 186 | }); |