Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/java/com/keylesspalace/tusky/MainActivity.java

main

Eugen Rochko 8 years ago

parent 473f7f75f1 68e10f77f4

commit 63b154fce1

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

Diff Content Not Available