« Previous | Next » 

Revision 7686ca93

ID7686ca93e036db5695059167250f26c67a4a1c45
Parent ecb48f3c, 8bbb87d4
Child 03914330

Added by Ruben S. Montero over 7 years ago

Merge branch 'master' into vdc-federation

Conflicts:
include/GroupPool.h
include/UserPool.h

Files

  • added
  • modified
  • copied
  • renamed
  • deleted