summaryrefslogtreecommitdiff
path: root/addons/web/static/test/test.html.THIS
AgeCommit message (Collapse)Author
2012-11-29[REM] merge conflict file committedXavier Morel
bzr revid: xmo@openerp.com-20121129112350-egvxrg8ii71wzdx6
2012-11-20[MERGE] from trunkXavier Morel
when creating the instance, set instance.session.uid to 42 so the evaluator has something to chew on when it tries to create the evaluation context bzr revid: xmo@openerp.com-20121120101733-b0ire11bbuywfi8u