Merge commit '8be5d3badf99d4707afbddddf58a87eb54aa68c1'

Browse Source

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

pull/9/head

Kelson 11 years ago

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

Diff Content Not Available