Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

8d964e03

Commit 8d964e03 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'agenda-export-by-project' of github.com:AMMD/dolibarr into

AMMD-agenda-export-by-project

Conflicts:
	htdocs/admin/agenda_xcal.php

parents 871c4f1b a7941805

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/admin/agenda_xcal.php 2 additions, 0 deletions

htdocs/admin/agenda_xcal.php
htdocs/comm/action/class/actioncomm.class.php 1 addition, 0 deletions

htdocs/comm/action/class/actioncomm.class.php
htdocs/langs/en_US/agenda.lang 3 additions, 3 deletions

htdocs/langs/en_US/agenda.lang
htdocs/langs/fr_FR/agenda.lang 1 addition, 0 deletions

htdocs/langs/fr_FR/agenda.lang
htdocs/public/agenda/agendaexport.php 2 additions, 0 deletions

htdocs/public/agenda/agendaexport.php

with 9 additions and 3 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