Merge remote-tracking branch 'remotes/upstream/master'

Browse Source

# Conflicts:
#	android/res/values/strings.xml

...

This commit is contained in:

Elad Keyshawn 2016-04-30 22:26:47 +03:00

parent a7c51d676a 489aadf271

commit 464106ad28

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