Merge branch 'release', to remove conflicts

Browse Source

Conflicts:
	mobile/AndroidManifest.xml

...

This commit is contained in:

Jon Atkins 2013-11-06 21:54:11 +00:00

parent d7bec48660 9496828883

commit de02756a12

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