[X2Go-Commits] [maintenancescripts] branch master updated (5217e99 -> b22a1e7)

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a change to branch master
in repository maintenancescripts.

      from  5217e99   git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges.
       new  b22a1e7   git/hooks: add update-merge.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 git/hooks/{update => update-merge} |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 copy git/hooks/{update => update-merge} (64%)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git