diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-30 17:00:52 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-30 17:00:52 +0200 |
| commit | 46712acaecb58954f5dac375445e4556d45c5f0b (patch) | |
| tree | 53b3763c98a95fd3e426481778013c17b65bf114 /addons/web/static/src | |
| parent | 8d822419e74969ff032db653a3797affeccace1b (diff) | |
| parent | d325c0caef433cb50a7589a69b00650be3bed56e (diff) | |
[FIX] bunch of changes lost in incorrect merge f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
Diffstat (limited to 'addons/web/static/src')
0 files changed, 0 insertions, 0 deletions