Merge branch 'develop' into ux

81cdf381 · Rafael Kellermann Streit · GitHub · 8ea9e334 · 8aad49c4 · 81cdf381
Commit 81cdf381 authored Jul 27, 2017 by Rafael Kellermann Streit Committed by GitHub Jul 27, 2017
Expand all Show whitespace changes
Inline Side-by-side

Showing with 718 additions and 0 deletions

CONDING_STYLE.md CONDING_STYLE.md +714 -0

README.md README.md +4 -0

No files found.
--- a/CONDING_STYLE.md
+++ b/CONDING_STYLE.md
--- a/README.md
+++ b/README.md
@@ -21,3 +21,7 @@ echo "sdk.dir="$ANDROID_HOME > local.properties
 ## Bug report & Feature request

 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.