merge conflict
authorGil Moskowitz <gmoskowitz@xtuple.com>
Fri, 11 Jul 2014 20:17:24 +0000 (16:17 -0400)
committerGil Moskowitz <gmoskowitz@xtuple.com>
Fri, 11 Jul 2014 20:17:24 +0000 (16:17 -0400)
commit8dc32ae766f76a04d30f1464f26068afc1fdfc58
tree2ccce7a1736a9baa1bd3f30876583b6389abab6a
parent8b26eab45b7bd6b176666f3643c4fe99ea9e528b
merge conflict
foundation-database/manifest.js