diff options
| author | Andreas Fischer <bantu@owncloud.com> | 2014-03-31 15:33:01 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@owncloud.com> | 2014-03-31 15:33:01 +0200 |
| commit | 2d69c4c2d351ec31023c26511151f84a9adb640f (patch) | |
| tree | 6b1b573c70814e3fe9c89d8db542781bb7574570 /core/img/actions/history.png | |
| parent | a55c56c9e7c0c78c1592f2501b527b5c977cafb7 (diff) | |
| parent | 65e3f634000a2142f412b85d0443f241bb64a9ab (diff) | |
| download | nextcloud-server-2d69c4c2d351ec31023c26511151f84a9adb640f.tar.gz nextcloud-server-2d69c4c2d351ec31023c26511151f84a9adb640f.zip | |
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
Diffstat (limited to 'core/img/actions/history.png')
| -rw-r--r-- | core/img/actions/history.png | bin | 321 -> 249 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/core/img/actions/history.png b/core/img/actions/history.png Binary files differindex 3234880b25a..ec2bbd0587f 100644 --- a/core/img/actions/history.png +++ b/core/img/actions/history.png |
