diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-30 21:49:28 +0200 |
| commit | b483f2aab856e3324026588a9702043072fd7ad2 (patch) | |
| tree | 9a5696d43ae53160bee592e1b6874185cbd98ad4 /README | |
| parent | cbaf858dea0f2094805edb6aa223bdd6877fff5b (diff) | |
| parent | 598815b21e94219eb66684c64802e165a35180ad (diff) | |
| download | nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.tar.gz nextcloud-server-b483f2aab856e3324026588a9702043072fd7ad2.zip | |
Merge branch 'master' into routing
Conflicts:
apps/contacts/js/contacts.js
apps/contacts/lib/search.php
apps/files_archive/js/archive.js
apps/gallery/lib/tiles.php
apps/gallery/templates/index.php
lib/ocs.php
Diffstat (limited to 'README')
| -rw-r--r-- | README | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -5,9 +5,9 @@ http://ownCloud.org Installation instructions: http://owncloud.org/support -Source code: http://gitorious.org/owncloud -Mailing list: http://mail.kde.org/mailman/listinfo/owncloud -IRC channel: http://webchat.freenode.net/?channels=owncloud +Source code: https://github.com/owncloud +Mailing list: https://mail.kde.org/mailman/listinfo/owncloud +IRC channel: https://webchat.freenode.net/?channels=owncloud Diaspora: https://joindiaspora.com/u/owncloud -Identi.ca: http://identi.ca/owncloud +Identi.ca: https://identi.ca/owncloud |