aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/converter/converter.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /node_modules/montage/core/converter/converter.js
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'node_modules/montage/core/converter/converter.js')
-rwxr-xr-xnode_modules/montage/core/converter/converter.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/node_modules/montage/core/converter/converter.js b/node_modules/montage/core/converter/converter.js
index a23d2702..97e1a5f2 100755
--- a/node_modules/montage/core/converter/converter.js
+++ b/node_modules/montage/core/converter/converter.js
@@ -111,7 +111,8 @@ var Converter = exports.Converter = Montage.create(Montage, /** @lends module:mo
111 @default {Boolean} true 111 @default {Boolean} true
112 */ 112 */
113 allowPartialConversion: { 113 allowPartialConversion: {
114 value: true 114 value: true,
115 serializable: true
115 }, 116 },
116 117
117 /** 118 /**