« Previous | Next » 

Revision f316a502

IDf316a502c3cbd290cc0419639a6d4704bf8a3bdb
Parent 452b1b6b, 78955474
Child 47068d5d

Added by meetecho over 6 years ago

Merge branch 'master' into modular-transports

Conflicts:
conf/janus.cfg.sample.in

Files

  • added
  • modified
  • copied
  • renamed
  • deleted