mirror of
https://github.com/kiwix/kiwix-js.git
synced 2025-09-24 04:54:51 -04:00
Merge branch 'master' of ssh://github.com/mossroy/evopedia-html5
Conflicts: index.html js/app.js
This commit is contained in:
commit
0216003660
1
.gitignore
vendored
1
.gitignore
vendored
@ -43,3 +43,4 @@ build/config/buildinfo.properties
|
||||
|
||||
www-built
|
||||
www-ghdeploy
|
||||
/push_to_gh_pages.sh
|
||||
|
Loading…
x
Reference in New Issue
Block a user