« Previous | Next » 

Revision d36dcd3d

IDd36dcd3debdb6d4a21c33b1d9503cabcab26cfa7
Parent 2773d5e9, 091494d7
Child 0b3895f0

Added by Christos KK Loverdos over 11 years ago

Merge branch 'master' into testing

Conflicts:
commissioning/servers/quotaholder/django_backend/callpoint.py

Files

  • added
  • modified
  • copied
  • renamed
  • deleted