[galette-commits] [GIT] galette/plugin-maps.git branch, develop, updated. 1.1.0-18-gd0047ab

[git@xxxxxxxxxxxxx]

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

The branch, develop has been updated
       via  d0047ab1d0b4d83cdf4555db31419527af4a823a (commit)
       via  51e5c0845b33903320da30affbb69c75c4f272d7 (commit)
       via  2d63fc53ee9f3a0becd7b99fa038aa10ff7081bb (commit)
       via  4cbb6e4624e2f3a78f469412d508dea556451a3d (commit)
       via  f316aeecc780a7ea7eb71f968d76e21e573f9756 (commit)
       via  a59fc1b69924ade5ed14015ea94059461284599f (commit)
       via  e7bc03a3831c0a01c0dc5598878d645d07991a8d (commit)
       via  ded0a61976cee7552b7c6c5c84a03435b63ba9d9 (commit)
       via  35d95c8bff182ce8ad25ed8ba614bf4720748c0c (commit)
       via  c6b3559d358e7da7c898281b0ce2d211674d92f5 (commit)
       via  2733c3d1065547e81c8bda7bce3aacc5480426e7 (commit)
       via  7b734c8884b5188bc224be1eb0caa98d76c0264a (commit)
      from  082037b40f4bfc9a5a4efa763a6d7f97d3ddbfdd (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 d0047ab1d0b4d83cdf4555db31419527af4a823a
Merge: 082037b 51e5c08
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 20 05:58:57 2014 +0100

    Merge branch 'hotfix/1.1.1' into develop
    
    Conflicts:
    	_define.php

commit 51e5c0845b33903320da30affbb69c75c4f272d7
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 20 05:57:44 2014 +0100

    Update changelog

commit 2d63fc53ee9f3a0becd7b99fa038aa10ff7081bb
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 20 05:56:56 2014 +0100

    Bump version and release date

commit 4cbb6e4624e2f3a78f469412d508dea556451a3d
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 20 05:56:03 2014 +0100

    OSM license has changed (thanks to Raphaël)

commit f316aeecc780a7ea7eb71f968d76e21e573f9756
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Mon Feb 3 21:30:30 2014 +0100

    Define a minimal height; fixes #786

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

Summary of changes:
 ChangeLog                            |    4 ++++
 _define.php                          |    4 ++--
 templates/default/common_scripts.tpl |    8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)


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

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