Project

General

Profile

« Previous | Next » 

Revision e71d5d13

IDe71d5d135cbdcdb8341b6eb72ec42d455928471b
Parent 04b1fa2a, 8f5db36a
Child 87b152c1

Added by Francois POIROTTE almost 12 years ago

Merge remote branch 'origin/release-2.0'

Conflicts:
vigiconf/src/vigilo/vigiconf/test/test_revisionmanager.py
vigimap/vigimap/public/js/ServiceElement.js
vigimap/vigimap/public/js/mapElement.js
vigimap/vigimap/public/js/menu.js

Change-Id: I30c0f817f5971c27fc782db9b3eb412909f833e4

Files

  • added
  • modified
  • copied
  • renamed
  • deleted