kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-17 03:16:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into #1526-keep-soft-input-on-search

Browse Source 
Merge any new changes from the develop branch to head off conflicts.
This commit is contained in:
Justin Biggs 2019-10-15 09:55:42 -05:00
commit 0f05ba72df
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -34,8 +34,7 @@ for you. If you prefer to build without Android Studio you must first
set up the Android SDK and then run the command: `./gradlew build ` set up the Android SDK and then run the command: `./gradlew build `
from the root directory of the project. from the root directory of the project.
We utilize different build variants (flavours) to build various We utilize different build variants (flavors) to build various versions of our app. Ensure your build variant is
different versions of our app. Ensure your build variant is
`kiwixDebug` to build the standard app. `kiwixDebug` to build the standard app.
## Libraries Used ## Libraries Used

32
app/src/main/assets/credits.html
View File

@ -20,22 +20,22 @@
<body class="content"> <body class="content">
<h2>Contributors</h2> <h2>Contributors</h2>
<a href="mailto:abdulwd97@gmail.com">Abdul Wadood</a><nr> Abdul Wadood<br>
<a href="mailto:adeelzafar619@gmail.com">Adeel Zafar</a><br> Adeel Zafar<br>
<a href="mailto:sood.aditya.08@gmail.com">Aditya Sood</a><br> Aditya Sood<br>
<a href="mailto:ayoubuto@gmail.com">Ayoub Dardory</a><br> Ayoub Dardory<br>
<a href="mailto:cip@gmx.at">Christian Pühringer</a><br> Christian Pühringer<br>
<a href="mailto:elad.keyshawn@gmail.com">Elad Keyshawn</a><br> Elad Keyshawn<br>
<a href="mailto:kelson@kiwix.org">Emmanuel Engelhart</a><br> Emmanuel Engelhart<br>
<a href="mailto:mhutti1@gmail.com">Isaac Hutt</a><br> Isaac Hutt<br>
<a href="mailto:joseph.reeve@googlemail.com">Joseph E. Reeve</a><br> Joseph E. Reeve<br>
<a href="mailto:julianharty@gmail.com">Julian Harty</a><br> Julian Harty<br>
<a href="mailto:rashiq.z@gmail.com">Rashiq Ahmad</a><br> Rashiq Ahmad<br>
<a href="mailto:reg@kiwix.org">Renaud Gaudin</a><br> Renaud Gaudin<br>
<a href="mailto:seantheappdev@gmail.com">Seán Mac Gillicuddy</a><br> Seán Mac Gillicuddy<br>
<a href="mailto:ssiddharth2010@gmail.com">Siddharth Sharma</a><br> Siddharth Sharma<br>
<a href="mailto:sm2030@cam.ac.uk">Souradip Mookerjee</a><br> Souradip Mookerjee<br>
<a href="https://translatewiki.net/wiki/Translating:Kiwix">Translatewiki community</a><br> Translatewiki community<br>
<h2>Licenses</h2> <h2>Licenses</h2>