Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/delete-my-account

d0663f55 · Filipe de Lima Brito · abacf9ee · cf91f096 · d0663f55 · d0663f55
Commit d0663f55 authored Nov 12, 2018 by Filipe de Lima Brito
Showing with 55 additions and 54 deletions

build-sdk.sh app/build-sdk.sh +0 -0

ic_launcher-web.png app/src/main/ic_launcher-web.png +0 -0

strings.xml app/src/main/res/values-ja/strings.xml +55 -54

gradlew gradlew +0 -0

No files found.
--- a/app/build-sdk.sh
+++ b/app/build-sdk.sh
--- a/app/src/main/ic_launcher-web.png
+++ b/app/src/main/ic_launcher-web.png
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
--- a/gradlew
+++ b/gradlew