Merge commit '8be5d3badf99d4707afbddddf58a87eb54aa68c1'

Browse Source

Conflicts:
	android/src/org/kiwix/kiwixmobile/SearchActivity.java

...

This commit is contained in:

Kelson 2016-01-07 10:56:26 +01:00

parent da8c49621a 09cd024199

commit 97e2c777d2

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