[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] a6bb78: Fix: Compatibility with v4 of
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] a6bb78: Fix: Compatibility with v4 of ckeditor (for debian... |
|
Date: |
Sat, 08 Mar 2014 05:17:59 -0800 |
Branch: refs/heads/3.5
Home: https://github.com/Dolibarr/dolibarr
Commit: a6bb785b5fb34cdc08d137fb085bebb86b710673
https://github.com/Dolibarr/dolibarr/commit/a6bb785b5fb34cdc08d137fb085bebb86b710673
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/main.inc.php
Log Message:
-----------
Fix: Compatibility with v4 of ckeditor (for debian)
Commit: 2e2f86b96884d850edb6828a96aae57ec26d62c4
https://github.com/Dolibarr/dolibarr/commit/2e2f86b96884d850edb6828a96aae57ec26d62c4
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
htdocs/core/class/doleditor.class.php
htdocs/main.inc.php
Commit: c082d7c82e0469b72a3ab1f92202a09d48467c0b
https://github.com/Dolibarr/dolibarr/commit/c082d7c82e0469b72a3ab1f92202a09d48467c0b
Author: Laurent Destailleur <address@hidden>
Date: 2014-03-08 (Sat, 08 Mar 2014)
Changed paths:
M htdocs/core/class/doleditor.class.php
M htdocs/main.inc.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
htdocs/main.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/0a2a6357552b...c082d7c82e04