Merge remote-tracking branch 'origin/master'

phrogg · Oct 19, 2019 · de5c8d3 · de5c8d3
2 parents 224c915 + 886cf7c
commit de5c8d3
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,51 @@
+#######################
+# Android development #
+#######################
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/libraries
+
+# Keystore files
+*.jks
+
+# Old content
+
 *.iml
 .gradle
 /local.properties

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <br>
 [![Donate Badge](https://img.shields.io/badge/Donate-Me-green.svg)](https://paypal.me/proggenbuck)
 
-# GetMiToken [ROOT]
+# GetMiTokens [ROOT]
 
 With this app you can extract the tokens from the Yeelight app.
 

diff --git a/fastlane/metadata/android/en-GB/short_description.txt b/fastlane/metadata/android/en-GB/short_description.txt
@@ -1 +1 @@
-An App to get the Tokens from the Yeelight app.
+Get the Tokens from the Yeelight app.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		An App to get the Tokens from the Yeelight app.
		Get the Tokens from the Yeelight app.