diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-01-02 10:19:24 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-01-02 10:19:24 +0100 |
| commit | d066478f10ef48bb228efafa20a8942f08d9eeab (patch) | |
| tree | 408b679222dc21f8217111c691549b565a366916 /addons/web_graph/static/src/css | |
| parent | 1dd4f9c77adc82b47fb439bb55f652af55a7b214 (diff) | |
| parent | 805b3d19b921ac9e9e0f88e147d190666ba65cad (diff) | |
[FIX] fixes weird push conflict between local and remote branch
bzr revid: ged@openerp.com-20140102091924-5fyo5qr339kr01z5
Diffstat (limited to 'addons/web_graph/static/src/css')
0 files changed, 0 insertions, 0 deletions