diff options
| author | Frank Karlitschek <frank@dev.(none)> | 2010-04-12 15:50:39 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@dev.(none)> | 2010-04-12 15:50:39 +0200 |
| commit | c69eab18d25fb685705a7bc20117f2f042fe7981 (patch) | |
| tree | 7a307c335ef6e2be1b283612313b3774318090a2 /ocs/providers.php | |
| parent | a061dd3314e3bf1e9adf29b5033086c991b2cf51 (diff) | |
| parent | 4a1d9370fcd5fb542d8d3915658d7fa1167dfeaf (diff) | |
| download | nextcloud-server-c69eab18d25fb685705a7bc20117f2f042fe7981.tar.gz nextcloud-server-c69eab18d25fb685705a7bc20117f2f042fe7981.zip | |
Merge commit 'refs/merge-requests/18' of git://gitorious.org/owncloud/owncloud
merge
Conflicts:
index.php
Diffstat (limited to 'ocs/providers.php')
0 files changed, 0 insertions, 0 deletions