diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2011-12-27 22:18:01 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2011-12-27 22:18:01 +0100 |
| commit | 3e2e5196d2b9a0d1e2d2c0e7d2e8ae0452685de0 (patch) | |
| tree | 41d227de4b2d96d3a1ca346c250a1270946f1842 /ocs | |
| parent | 5fd595c0bfcd3fb8857f62aa9efb28a2669a0301 (diff) | |
| parent | f3e8776dc63656d99c39c007c230a80c0c9e384b (diff) | |
| download | nextcloud-server-3e2e5196d2b9a0d1e2d2c0e7d2e8ae0452685de0.tar.gz nextcloud-server-3e2e5196d2b9a0d1e2d2c0e7d2e8ae0452685de0.zip | |
Merge branch 'tanghus_remote_backup' of git://gitorious.org/~tanghus/owncloud/tanghus-owncloud
Conflicts:
apps/calendar/export.php
apps/contacts/index.php
Diffstat (limited to 'ocs')
0 files changed, 0 insertions, 0 deletions