lp://staging/~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/openerp-mgmtsystem/6.1

Sandy Carter (http://www.savoirfairelinux.com): Pending requested 2014-04-18

Diff: 15 lines (+4/-0) (has conflicts)

1 file modified

mgmtsystem_audit/__openerp__.py (+4/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

45. By Sandy Carter (http://www.savoirfairelinux.com) on 2014-04-18

Force a merge conflict

44. By Virgil Dupras on 2013-05-29

[MRG] Fix language of the audit report

43. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-05-20

Launchpad automatic translations update.

42. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-05-16

Launchpad automatic translations update.

41. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-03-29

Launchpad automatic translations update.

40. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-03-21

Launchpad automatic translations update.

39. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-03-09

Launchpad automatic translations update.

38. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-03-01

Launchpad automatic translations update.

37. By Launchpad Translations on behalf of openerp-mgmtsystem-core-editors on 2013-02-28

Launchpad automatic translations update.

36. By Maxime Chambreuil (http://www.savoirfairelinux.com) on 2013-02-27

[UPD] POT files and french translation