« Previous | Next » 

Revision fcae47a8

IDfcae47a843326907e45a6d658031020e5aa9a276
Parent 097bcae0, 11f5c8c2
Child 1f5d9134

Added by Ruben S. Montero about 9 years ago

Merge branch 'bug-1306'

Conflicts:
src/sunstone/public/js/plugins/marketplace-tab.js
src/sunstone/public/js/plugins/vms-tab.js
src/tm/TransferManager.cc

Files

  • added
  • modified
  • copied
  • renamed
  • deleted