Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix

Browse Source

Conflicts:
	android/AndroidManifest.xml

pull/9/head

Emmanuel Engelhart 11 years ago

parent 2490f3c916 e6e500007c

commit cdb53beb3b

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