Project

General

Profile

« Previous | Next » 

Revision adab4077

Added by Benjamin Dauvergne about 12 years ago

Merge branch 'master' into dev

Conflicts:
calebasse/agenda/templates/agenda/appointment.html

  • added
  • modified
  • copied
  • renamed
  • deleted