[Dolibarr-git] [Dolibarr/dolibarr] fb3f69: Work on module website

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: fb3f6972ebc1542dba768565353f33c19a96da7c
      
https://github.com/Dolibarr/dolibarr/commit/fb3f6972ebc1542dba768565353f33c19a96da7c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M htdocs/public/websites/index.php
    A htdocs/public/websites/styles.css.php
    M htdocs/websites/index.php

  Log Message:
  -----------
  Work on module website

Conflicts:
        htdocs/websites/index.php


  Commit: 54b47d7f4f2be3de625234830c0d15d9fe5877ab
      
https://github.com/Dolibarr/dolibarr/commit/54b47d7f4f2be3de625234830c0d15d9fe5877ab
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-08-08 (Mon, 08 Aug 2016)

  Changed paths:
    M htdocs/install/mysql/tables/llx_website.sql
    M htdocs/websites/class/website.class.php
    M htdocs/websites/index.php

  Log Message:
  -----------
  Fix edit of page in module website

Conflicts:
        htdocs/websites/class/website.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4cf01bc685fe...54b47d7f4f2b