Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

938936b8

Commit 938936b8 authored 10 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/3.6' into 3.7

Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/core/lib/functions.lib.php

parents f4233865 bd6b465e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

ChangeLog 2 additions, 0 deletions

ChangeLog
htdocs/comm/action/class/ical.class.php 29 additions, 4 deletions

htdocs/comm/action/class/ical.class.php
htdocs/comm/action/index.php 1 addition, 0 deletions

htdocs/comm/action/index.php
htdocs/core/lib/agenda.lib.php 4 additions, 0 deletions

htdocs/core/lib/agenda.lib.php
htdocs/core/lib/functions.lib.php 13 additions, 14 deletions

htdocs/core/lib/functions.lib.php
test/phpunit/FunctionsLibTest.php 15 additions, 0 deletions

test/phpunit/FunctionsLibTest.php

with 64 additions and 18 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