Merge remote-tracking branch 'owncloud/master' into db-convert-tool
* owncloud/master: (663 commits) [tx-robot] updated from transifex [tx-robot] updated from transifex Sub-dir was prepended twice Sub-dir was prepended twice [tx-robot] updated from transifex Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 Emit event after setting a new expiration for a share adding @method annotation to declare methods which can be called on the wrapped statement object Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. don't write file if opening a stream to encrypt the data fails Do not retrieve storage stats for trash bin [tx-robot] updated from transifex prevent dimmed ocdialog div from scrolling fix breadcrumbs for IE8 enable SVG->PNG fallback for 'New' menu enable SVG->PNG fallback for newly uploaded files and folders specify logo to not repeat when container is bigger fix SVG replacement for logo so it works in IE8, fix #7866 Fix swift touch operation [tx-robot] updated from transifex ... Conflicts: 3rdparty
Please register or sign in to comment