[Dolibarr-git] [Dolibarr/dolibarr] 5a7fe6: Fix: Change to make debian package ok despite remo...

[Laurent Destailleur]

  Branch: refs/heads/3.4_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 5a7fe6b4a7bc31285a0ef39cf396218a36fa2f9b
      
https://github.com/Dolibarr/dolibarr/commit/5a7fe6b4a7bc31285a0ef39cf396218a36fa2f9b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    M htdocs/admin/modules.php
    M htdocs/core/modules/modFckeditor.class.php

  Log Message:
  -----------
  Fix: Change to make debian package ok despite removal of ckeditor
package.


  Commit: 555a49d66ef8176e2053c5c5c0080a79857a5376
      
https://github.com/Dolibarr/dolibarr/commit/555a49d66ef8176e2053c5c5c0080a79857a5376
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-04 (Sat, 04 Jan 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc


  Commit: 5b63b56143f572e73de851bc2ef9be4475537d3a
      
https://github.com/Dolibarr/dolibarr/commit/5b63b56143f572e73de851bc2ef9be4475537d3a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/modules.php
    M htdocs/core/modules/modFckeditor.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
        ChangeLog


  Commit: 376067b918934190681aa626e9068884f2eeacf6
      
https://github.com/Dolibarr/dolibarr/commit/376067b918934190681aa626e9068884f2eeacf6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-06 (Mon, 06 Jan 2014)

  Changed paths:
    M ChangeLog
    M htdocs/admin/modules.php
    M htdocs/core/modules/modFckeditor.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.4_backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5d1fcb2c5508...376067b91893