diff options
| author | Eric Guzman | 2012-04-26 03:16:50 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-04-26 03:16:50 -0700 |
| commit | 110aa15b48ec24063815aa3b86c7f8f041543a02 (patch) | |
| tree | d0debb235807dd73f48e0793a73d37cc41ecf59c /js/controllers/elements/stage-controller.js | |
| parent | 143105a0b9c7765898b22d53489b4bd8df3dff2e (diff) | |
| parent | bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff) | |
| download | ninja-110aa15b48ec24063815aa3b86c7f8f041543a02.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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 | }); |