~hr-core-editors/openerp-hr/6.1

Viewing all changes in revision 315.

[MRG] 6.1-modules-from-other-projects (hr_skill kept unchanged on conflict resolution)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: