Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/androidTest/java/com/appttude/h_mal/easycc/MainActivityTest.java
This commit is contained in:
2020-04-12 19:19:57 +01:00
2 changed files with 4 additions and 2 deletions

View File

@@ -375,4 +375,4 @@ public class MainActivityJava extends AppCompatActivity {
}
}
}