Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

This commit is contained in:
AndyScherzinger 2015-07-26 22:35:28 +02:00
commit dbe0ff54ae

View file

@ -1,8 +1,20 @@
This is the Android client for [ownCloud][0].
#This is the Android client for [ownCloud][0]
The app performs file synchronization with an ownCloud server. Other ownCloud features may be added in the future, but they are not a priority right now.
## Build Status on
Git master: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=master)
Git develop: ![Build Status](https://api.travis-ci.org/owncloud/android.svg?branch=develop)
## Development
### Project Setup
Make sure you read [SETUP.md][1] when you start working on this project.
[0]: https://github.com/owncloud/core
[1]: https://github.com/owncloud/android/blob/master/SETUP.md
### Contributing
Please see [Contribution Guidelines](https://owncloud.org/contribute/). Fork this repository and contribute back using
[pull requests](https://github.com/owncloud/android/pulls). All pull requests should be based on, and targeted to, the ['develop'](https://github.com/owncloud/android/tree/develop) branch.