Merge remote-tracking branch 'origin/master' into maintenance

This commit is contained in:
Tlaster 2020-04-13 17:36:54 +08:00
commit 56adba7f84
2 changed files with 3 additions and 2 deletions

3
.gitignore vendored
View File

@ -37,4 +37,5 @@ Thumbs.db
# JRE error dumps
hs_err_*.log
.externalNativeBuild/
# NDK related
.externalNativeBuild/

View File

@ -1,7 +1,7 @@
# Twidere for Android #
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Twidere-brightgreen.svg?style=flat)](http://android-arsenal.com/details/3/2453)
[![Travis status](https://api.travis-ci.org/TwidereProject/Twidere-Android.png)](https://travis-ci.org/TwidereProject/Twidere-Android/)
[![Travis status](https://img.shields.io/travis/TwidereProject/Twidere-Android.svg)](https://travis-ci.org/TwidereProject/Twidere-Android/)
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/twidere/localized.svg)](https://crowdin.com/project/twidere)
Material Design ready and feature rich Twitter app for Android 4.0+