Revision e71d5d13
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