~peter-langenberg/openerp-mgmtsystem/7.0-saas4

Viewing all changes in revision 74.2.6.

  • Committer: Maxime Chambreuil
  • Date: 2013-09-17 22:08:14 UTC
  • mfrom: (80 openerp-mgmtsystem)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: maxime.chambreuil@savoirfairelinux.com-20130917220814-tyohu3s1hrp6p2v1
[FIX] Conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: