diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-15 09:51:04 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2012-06-15 09:51:04 +0200 |
| commit | 4b7bdd5ace5a7274306ab135d74a52ba9b19c847 (patch) | |
| tree | 694698759d0e36fed51e41f28afba85738133939 /lib | |
| parent | effb6f1309a2ce3800c0758257a7f7825a8fa5d1 (diff) | |
| parent | 4eb0c270aa902bd5d84edb2500f866fed4e6e9ab (diff) | |
| download | nextcloud-server-4b7bdd5ace5a7274306ab135d74a52ba9b19c847.tar.gz nextcloud-server-4b7bdd5ace5a7274306ab135d74a52ba9b19c847.zip | |
Merge commit 'refs/merge-requests/128' of git://gitorious.org/owncloud/owncloud into merge-requests/128
Conflicts:
apps/gallery/templates/index.php
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions