diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-05-17 12:05:10 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2013-05-17 12:05:10 +0530 |
| commit | 9f6c2f753493b98f02a4e1826c0f8cbadcacb5e2 (patch) | |
| tree | dff2841081331645cb324c3e5d2659cb69c6ebbe /addons/web/static/lib/bootstrap/javascripts | |
| parent | 92992932a83b44fb4f2d72f2d511552eaa986bb3 (diff) | |
| parent | a231356ba33cbad366916ad8455244fb66a8fb90 (diff) | |
[MERGE] Merged main branch lp:~openerp-dev/openobject-addons/trunk-job-positions and removed CONFLICTS.
bzr revid: psa@tinyerp.com-20130517063510-5oqrwb9yx973z5mi
Diffstat (limited to 'addons/web/static/lib/bootstrap/javascripts')
0 files changed, 0 insertions, 0 deletions