Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

Coopdevs OCB mirror
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- External wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

6ed56d83

Commit 6ed56d83 authored 10 years ago by Thibault Delavallée

Downloads
- Plain Diff

Merge remote-tracking branch 'odoo/saas-4' into saas-4-website-mail-group-tde

parents 59a7c85a 7184f8c3

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.bzrignore 0 additions, 15 deletions

.bzrignore
.gitignore 28 additions, 0 deletions

.gitignore
addons/website/models/ir_http.py 2 additions, 1 deletion

addons/website/models/ir_http.py
addons/website_event_track/controllers/event.py 11 additions, 0 deletions

addons/website_event_track/controllers/event.py
addons/website_event_track/views/website_event.xml 6 additions, 6 deletions

addons/website_event_track/views/website_event.xml
openerp/http.py 2 additions, 2 deletions

openerp/http.py
openerp/report/render/rml2pdf/trml2pdf.py 1 addition, 3 deletions

openerp/report/render/rml2pdf/trml2pdf.py

with 50 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment