diff options
| author | Thibault Delavallée <tde@openerp.com> | 2014-01-16 13:09:49 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2014-01-16 13:09:49 +0100 |
| commit | a1748260de4f4023616b0394fc98db90624d7920 (patch) | |
| tree | 3061ccd2708430454de13f0c49dba9736b3d8b94 /addons/analytic_user_function/analytic_user_function_view.xml | |
| parent | a00d24988f123d6ff2e9eaa9e164187c7022f9c9 (diff) | |
| parent | 6252ac4d1112257381711d644693747349a51659 (diff) | |
[MERGE] Due to some issues with the trunk being merged
in my branch, I merge the legacy website-al branch, in order to perform an fp-style
merge.
Revisions included :
10487 and 10498 from fme that are null (commit and revert)
10488 from xmo: [ADD] dialog for fontawesome glyph manipulation
bzr revid: tde@openerp.com-20140116120949-27dnoa9n2pz0ms6q
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function_view.xml')
0 files changed, 0 insertions, 0 deletions