Merge remote-tracking branch 'origin/master' into dev

Browse Source

Conflicts:
	app/src/main/res/values-sr/strings.xml

...

This commit is contained in:

Anthony Restaino 2015-05-04 12:30:17 -04:00

parent df903551c0 15fcb2ed62

commit 051a453e7b

1 changed files with 1 additions and 1 deletions

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