~sandy-carter/openerp-mgmtsystem/IGNOREME_cause_conflict

  • Committer: Sandy Carter
  • Date: 2014-04-18 19:14:10 UTC
  • Revision ID: sandy.carter@savoirfairelinux.com-20140418191410-73zlm9otblvalwuc
Force a merge conflict
Filename Latest Rev Last Changed Committer Comment Size
..
i18n 4.1.1 12 years ago Maxime Chambreuil [ADD] mgmtsystem_kpi Diff
images 4.1.1 12 years ago Maxime Chambreuil [ADD] mgmtsystem_kpi Diff
security 4.1.1 12 years ago Maxime Chambreuil [ADD] mgmtsystem_kpi Diff
static 11 11 years ago Maxime Chambreuil [ADD] Icons Diff
File __init__.py 11.1.41 11 years ago Daniel Reis [FIX] .py files licenses to AGPL 114 bytes Diff Download File
File __openerp__.py 11.1.41 11 years ago Daniel Reis [FIX] .py files licenses to AGPL 2.3 KB Diff Download File
File mgmtsystem_kpi.py 11.1.41 11 years ago Daniel Reis [FIX] .py files licenses to AGPL 15.5 KB Diff Download File
mgmtsystem_kpi_view.xml 4.1.8 11 years ago Maxime Chambreuil [FIX] group_mgmtsystem_manager XML ID [IMP] mgmtsy 13.2 KB Diff Download File