Merge remote-tracking branch 'NudeDude/master'
# Conflicts: # app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java # app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java
This commit is contained in:
commit
595ec128cd