[galette-commits] [GIT] galette/galette.git branch, develop, updated. 0.7.0.1-245-g861cd2d

[git@xxxxxxxxxxxxx]

This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/galette.git".

The branch, develop has been updated
       via  861cd2d36bba81de42cfbee60cc68e424160bf50 (commit)
       via  6e5a18670a36a0885f3f5065ed970e4d08ecdfc2 (commit)
       via  1cca5fe27d85ceeaba3574bbede61e5890a3ddc5 (commit)
       via  0a82e66fb6af1959874c72da89d0fe2503dcc76f (commit)
       via  992b3b335d0da0a14dabb870156b37b80409dd4b (commit)
       via  4e2b0770dc87a41505c712c7aaae74057b4214d5 (commit)
       via  953ff4d5bb174d985e2e69f006a49a173e9f8bf4 (commit)
      from  95475de6a4308cb6280f67f8c7e8863902ada114 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 861cd2d36bba81de42cfbee60cc68e424160bf50
Merge: 95475de 6e5a186
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Oct 6 00:38:51 2012 +0200

    Merge branch 'release/0.7.1' into develop
    
    Conflicts:
    	galette/includes/dynamic_fields.inc.php
    	galette/includes/html5-ie.js
    	galette/templates/default/ie.css

-----------------------------------------------------------------------

Summary of changes:
 galette/includes/html5-ie.js                    |    4 +-
 galette/lib/Galette/Core/Picture.php            |    8 +-
 galette/mailing_adherents.php                   |    4 +-
 galette/templates/default/galette.css           |   11 +-
 galette/templates/default/ie.css                |  204 +++++++++++++++++++++--
 galette/templates/default/mailing_adherents.tpl |   15 +-
 6 files changed, 213 insertions(+), 33 deletions(-)


hooks/post-receive
--
galette/galette.git

-- 
-- 
Galette repositories commits - http://galette.tuxfamily.org