Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: src/ploneintranet/workspace/browser/templates/roster-edit.pt
- Loading branch information
Conflicts: src/ploneintranet/workspace/browser/templates/roster-edit.pt