bt5/erp5_ui_test/bt/revision · 7ab4b81d0e8bb4663f2afc9ee11bb0511356936d · Sven Franck / erp5 · GitLab

Find file Blame History Permalink

Solve merge conflicts on revision files modified at rafael and master branch · 7ab4b81d
Rafael Monnerat authored Apr 24, 2012
```
Merged master into rafael branch

Conflicts:
	bt5/erp5_ui_test/bt/revision
	product/ERP5/bootstrap/erp5_core/bt/revision
```
7ab4b81d

revision 4 Bytes