[Dolibarr-git] [Dolibarr/dolibarr] b536c8: Add missing image into amarok theme

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b536c8a10c0d5267af13c8ffb3bd31aae558c1d5
      
https://github.com/Dolibarr/dolibarr/commit/b536c8a10c0d5267af13c8ffb3bd31aae558c1d5
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    A htdocs/theme/amarok/img/object_address.png

  Log Message:
  -----------
  Add missing image into amarok theme


  Commit: b728ccb52faf5c54e0a8971ab0bbea0aa82d7748
      
https://github.com/Dolibarr/dolibarr/commit/b728ccb52faf5c54e0a8971ab0bbea0aa82d7748
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    A htdocs/theme/amarok/img/object_address.png

  Log Message:
  -----------
  Merge pull request #1865 from FHenry/3.5

Add missing image into amarok theme


  Commit: 8dd935821455b81a9f40d806d5f1930f7ab9c2a9
      
https://github.com/Dolibarr/dolibarr/commit/8dd935821455b81a9f40d806d5f1930f7ab9c2a9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/liste.php
    M htdocs/cashdesk/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/holiday/index.php
    M htdocs/opensurvey/list.php
    M htdocs/product/index.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/tasks/index.php

  Log Message:
  -----------
  Fix: SQL injection


  Commit: 09878a3a3210fb2b9db6f7a1b5b0b3e184ff8a89
      
https://github.com/Dolibarr/dolibarr/commit/09878a3a3210fb2b9db6f7a1b5b0b3e184ff8a89
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    A htdocs/theme/amarok/img/object_address.png

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


  Commit: f264e25514cf38ce4f6806b2c1fa4cc20dcfe4bc
      
https://github.com/Dolibarr/dolibarr/commit/f264e25514cf38ce4f6806b2c1fa4cc20dcfe4bc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-13 (Sat, 13 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/class/adherent.class.php
    M htdocs/cashdesk/index.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/info.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/bankid_fr.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/compta/prelevement/liste.php
    M htdocs/compta/prelevement/rejets.php
    M htdocs/compta/recap-compta.php
    M htdocs/contact/info.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/info.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/holiday/index.php
    M htdocs/opensurvey/list.php
    M htdocs/product/index.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stock/liste.php
    M htdocs/product/stock/massstockmove.php
    M htdocs/product/stock/replenishorders.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/tasks/index.php
    A htdocs/theme/amarok/img/object_address.png

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/adherents/liste.php
        htdocs/compta/bank/bankid_fr.php
        htdocs/holiday/index.php
        htdocs/opensurvey/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/98d7ce94b8d0...f264e25514cf