Commit 6544bab5 authored by dimsedane's avatar dimsedane Committed by GitHub

Merge branch 'develop' into feature/delete_message

parents 3c7ac659 ea8a335e
This diff is collapsed.
...@@ -36,4 +36,4 @@ Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Andro ...@@ -36,4 +36,4 @@ Please report via [GitHub issue](https://github.com/RocketChat/Rocket.Chat.Andro
## Coding Style ## 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.
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