Adding s3 server side encryption support
Adding s3 server side encryption support
Merge pull request #27 from christ66/master

Fixed documentation.
Merge pull request #24 from cbdr/server_side_encryption

Server side encryption
Removoved unused import and corrected formatting.
Option to flatten directories for uploads
populate select from descriptor, or they get empty when a new entry is created
Merge pull request #25 from jsternberg/flatten-directory-structure

Option to flatten directories for uploads
Merge pull request #31 from ndeloof/master

populate select from descriptor, or they get empty when a new entry is created
Merged changes
Merge branch 'recampbell-jenkins-19587'
Revert "Merge branch 'recampbell-jenkins-19587'"

This reverts commit a5384f10dad6a76c79995ac426feda84e08c9f8b, reversing
changes made to 9fac76f226b75f5224a42c3651a4ad107da10f46.