Merge lp://staging/~therp-nl/therp-addons/7.0-remove_ldap_modules into lp://staging/~therp-nl/therp-addons/7.0
Proposed by
Stefan Rijnhart (Opener)
Status: | Merged |
---|---|
Merged at revision: | 80 |
Proposed branch: | lp://staging/~therp-nl/therp-addons/7.0-remove_ldap_modules |
Merge into: | lp://staging/~therp-nl/therp-addons/7.0 |
Diff against target: |
626 lines (+0/-551) 14 files modified
users_ldap_groups/__init__.py (+0/-22) users_ldap_groups/__openerp__.py (+0/-64) users_ldap_groups/security/ir.model.access.csv (+0/-2) users_ldap_groups/users_ldap_groups.py (+0/-98) users_ldap_groups/users_ldap_groups.xml (+0/-38) users_ldap_groups/users_ldap_groups_operators.py (+0/-44) users_ldap_populate/__init__.py (+0/-1) users_ldap_populate/__openerp__.py (+0/-49) users_ldap_populate/i18n/nl.po (+0/-56) users_ldap_populate/model/__init__.py (+0/-2) users_ldap_populate/model/populate_wizard.py (+0/-42) users_ldap_populate/model/users_ldap.py (+0/-96) users_ldap_populate/view/populate_wizard.xml (+0/-17) users_ldap_populate/view/users_ldap.xml (+0/-20) |
To merge this branch: | bzr merge lp://staging/~therp-nl/therp-addons/7.0-remove_ldap_modules |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | Approve | ||
Review via email: mp+176371@code.staging.launchpad.net |
To post a comment you must log in.