diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-08-11 16:03:41 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-08-11 16:03:41 +0200 |
| commit | 233670d681a2fd045abd7a110e7097315a9aa5b2 (patch) | |
| tree | a7617fb0f59c4131c9eed6896caf77df9ad39ccb /doc/reference/javascript.rst | |
| parent | ae65be2b2ae98860f70a7e6f3d7679c40ea9bd93 (diff) | |
[FIX] ir_cron: forgotten conflict from forward port ae65be2b2ae98860f70a7e6f3d7679c40ea9bd93
Diffstat (limited to 'doc/reference/javascript.rst')
0 files changed, 0 insertions, 0 deletions