Commit 81cdf381 authored by Rafael Kellermann Streit's avatar Rafael Kellermann Streit Committed by GitHub

Merge branch 'develop' into ux

parents 8ea9e334 8aad49c4
This diff is collapsed.
...@@ -21,3 +21,7 @@ echo "sdk.dir="$ANDROID_HOME > local.properties ...@@ -21,3 +21,7 @@ echo "sdk.dir="$ANDROID_HOME > local.properties
## Bug report & Feature request ## Bug report & Feature request
Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Android/issues) :) Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Android/issues) :)
## Coding Style
Please follow our [coding style](https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/CODING_STYLE.md) when contributing.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment