[galette-commits] [GIT] galette/plugin-events.git branch develop updated. 1.1.1-9-g0a8f93c

[<git@xxxxxxxxxxxxx>]

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

The branch, develop has been updated
       via  0a8f93ca0318c90690dc4063a4a299e0f28b3fdc (commit)
       via  7317f7d687e98cf171d60366fcf990e8236d8231 (commit)
       via  c44039c6d6f0ece5b516e09d1ca5ac9f610305c1 (commit)
       via  0a370339fa82eef1a2ed81293586e440ab91767a (commit)
       via  a770f20f189eeeb405114c12773cc611c0a1fc03 (commit)
       via  0592ec68f1b14e1290ebb502fa963ffdc8d1344e (commit)
       via  0e89e041f5ae6ecdd1a8b0b5d7c25752ea4a5864 (commit)
      from  adbfddb77f27716148d14dbed9be5beb66b9af3d (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 0a8f93ca0318c90690dc4063a4a299e0f28b3fdc
Merge: adbfddb 7317f7d
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 28 07:31:13 2019 +0100

    Merge branch 'hotfix/1.1.2' into develop

commit 7317f7d687e98cf171d60366fcf990e8236d8231
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Feb 28 07:30:48 2019 +0100

    Bump version, update changelog

commit c44039c6d6f0ece5b516e09d1ca5ac9f610305c1
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jan 31 07:58:38 2019 +0100

    array_merge resets index, which is expected to contain member id
    
    refs #1238 #1248

commit 0a370339fa82eef1a2ed81293586e440ab91767a
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jan 31 07:49:36 2019 +0100

    Wrong variable

commit a770f20f189eeeb405114c12773cc611c0a1fc03
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Thu Jan 31 07:49:26 2019 +0100

    Fix activity removal button on event

commit 0592ec68f1b14e1290ebb502fa963ffdc8d1344e
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date:   Sat Jan 26 09:40:27 2019 +0100

    Fix wrong copy-pasted variable

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

Summary of changes:
 ChangeLog                     | 4 ++++
 _define.php                   | 4 ++--
 _routes.php                   | 5 +----
 templates/default/booking.tpl | 2 +-
 templates/default/event.tpl   | 5 ++++-
 5 files changed, 12 insertions(+), 8 deletions(-)


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

-- 
Galette repositories commits - http://galette.eu

List documentation: https://listengine.tuxfamily.org/lists.galette.eu/commits/