[Dolibarr-git] [Dolibarr/dolibarr] 72aacb: NEW Can use native php and dolibarr object on page...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 72aacb81aecc4bd03ddd13322d67a2ff11386ff3
      
https://github.com/Dolibarr/dolibarr/commit/72aacb81aecc4bd03ddd13322d67a2ff11386ff3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M htdocs/core/class/doleditor.class.php
    M htdocs/public/websites/index.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/websites/index.php

  Log Message:
  -----------
  NEW Can use native php and dolibarr object on pages of module website.


  Commit: d0136f5c857cab1a7fd37ddaf06d742cd18fad5e
      
https://github.com/Dolibarr/dolibarr/commit/d0136f5c857cab1a7fd37ddaf06d742cd18fad5e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M htdocs/websites/index.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/websites/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a97161b044de...d0136f5c857c