Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/res/xml/preferences.xml

...

This commit is contained in:

Roi Greenberg 2018-08-25 22:33:47 +03:00

parent deee908fb0 2ab7bd84b6

commit d9720e97a0

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