« Previous | Next » 

Revision 62b1be1c

ID62b1be1c7eb7c98eebff95b879655665bb259c02
Parent d24f6b43, 9b9aed19
Child 6c14d509

Added by Hector Sanjuan over 9 years ago

Merge remote-tracking branch 'upstream/master'

Conflicts:
src/sunstone/public/js/plugins/vnets-tab.js
src/sunstone/public/locale/ru/ru.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted