Merge branch 'develop' into feature/delete_message

6544bab5 · dimsedane · GitHub · 3c7ac659 · ea8a335e · 3c7ac659
Commit 6544bab5 authored Oct 18, 2017 by dimsedane Committed by GitHub Oct 18, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 715 deletions

CODING_STYLE.md CODING_STYLE.md +0 -714

README.md README.md +1 -1

No files found.
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
--- a/README.md
+++ b/README.md
@@ -36,4 +36,4 @@ Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Andro

 ## Coding Style

-Please follow our [coding style](https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/CODING_STYLE.md) when contributing.
+Please follow our [coding style](https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md) when contributing.