aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-07-16 02:29:58 -0700
committerThomas Müller <thomas.mueller@tmit.eu>2013-07-16 02:29:58 -0700
commitd673d8c25310f0ea73927b8b252e6823a11087f4 (patch)
tree875dd481a295a833b7bd9922f534dad9e30b2b4f
parentfeb01847e75226493a38ce82038bdab3d3232be3 (diff)
parent7403cfff8bb0460e4ebaee64cadb4cb02284ba66 (diff)
downloadnextcloud-server-d673d8c25310f0ea73927b8b252e6823a11087f4.tar.gz
nextcloud-server-d673d8c25310f0ea73927b8b252e6823a11087f4.zip
Merge pull request #4075 from owncloud/markdown-readme-master
Markdown readme master
-rw-r--r--README20
-rw-r--r--README.md26
2 files changed, 26 insertions, 20 deletions
diff --git a/README b/README
deleted file mode 100644
index 5f5d190cb01..00000000000
--- a/README
+++ /dev/null
@@ -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/
diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..ca7b04a925a
--- /dev/null
+++ b/README.md
@@ -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/