Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	app/src/main/res/values/strings.xml

...

This commit is contained in:

Jaculabilis 2016-10-15 22:41:27 -05:00

parent e5e0fb3daa fe8b389e7e

commit efe58d3319

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