« Previous | Next » 

Revision e958626b

IDe958626b074fe05156894205f8e869336fbbdaea
Parent 5fea81a2, 64ddd8f4
Child 2c421c23

Added by Hector Sanjuan over 9 years ago

Merge remote-tracking branch 'upstream/master'

Conflicts:
src/sunstone/public/js/plugins/images-tab.js
src/sunstone/public/js/plugins/vms-tab.js

Files

  • added
  • modified
  • copied
  • renamed
  • deleted