Merge remote-tracking branch 'NudeDude/master'

Browse Source

# 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:

NudeDude 2018-01-20 16:59:24 +01:00

parent f62dd2e4de 4c24bfb463

commit 595ec128cd

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available