mirror of https://github.com/nextcloud/server.git
Merge branch 'master' into parallel-autotest.sh-master
commit
fdfb224d97
@ -1 +1 @@
|
||||
Subproject commit 217626723957161191572ea50172a3943c30696d
|
||||
Subproject commit 25e8568d41a9b9a6d1662ccf33058822a890e7f5
|
@ -1,20 +0,0 @@
|
||||
ownCloud gives you freedom and control over your own data.
|
||||
A personal cloud which runs on your own server.
|
||||
|
||||
http://ownCloud.org
|
||||
|
||||
Installation instructions: http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
|
||||
Contribution Guidelines: http://owncloud.org/dev/contribute/
|
||||
|
||||
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: https://identi.ca/owncloud
|
||||
|
||||
Important notice on translations:
|
||||
Please submit translations via Transifex:
|
||||
https://www.transifex.com/projects/p/owncloud/
|
||||
|
||||
For more detailed information about translations:
|
||||
http://owncloud.org/dev/translation/
|
@ -0,0 +1,26 @@
|
||||
# ownCloud
|
||||
|
||||
[ownCloud](http://ownCloud.org) gives you freedom and control over your own data.
|
||||
A personal cloud which runs on your own server.
|
||||
|
||||
### Build Status on [Jenkins CI](https://ci.owncloud.org/)
|
||||
Git master: [![Build Status](https://ci.owncloud.org/buildStatus/icon?job=ownCloud-Server%28master%29)](https://ci.owncloud.org/job/ownCloud-Server%28master%29/)
|
||||
|
||||
### Installation instructions
|
||||
http://doc.owncloud.org/server/5.0/developer_manual/app/gettingstarted.html
|
||||
|
||||
### Contribution Guidelines
|
||||
http://owncloud.org/dev/contribute/
|
||||
|
||||
### Get in touch
|
||||
* [Forum](http://forum.owncloud.org)
|
||||
* [Mailing list](https://mail.kde.org/mailman/listinfo/owncloud)
|
||||
* [IRC channel](https://webchat.freenode.net/?channels=owncloud)
|
||||
* [Twitter](https://twitter.com/ownClouders)
|
||||
|
||||
### Important notice on translations
|
||||
Please submit translations via Transifex:
|
||||
https://www.transifex.com/projects/p/owncloud/
|
||||
|
||||
For more detailed information about translations:
|
||||
http://owncloud.org/dev/translation/
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue