diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/components/layout/bread-crumb.reel/bread-crumb.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/layout/bread-crumb.reel/bread-crumb.html')
| -rwxr-xr-x | js/components/layout/bread-crumb.reel/bread-crumb.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 0dabc781..68f3be2b 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | "buttonsListController": { | 40 | "buttonsListController": { |
| 41 | "prototype": "montage/ui/controller/array-controller", | 41 | "prototype": "montage/ui/controller/array-controller", |
| 42 | "bindings": { | 42 | "bindings": { |
| 43 | "content": {"<<->": "@owner.containerElements"} | 43 | "content": {"<->": "@owner.containerElements"} |
| 44 | } | 44 | } |
| 45 | }, | 45 | }, |
| 46 | 46 | ||