Merge branch 'master' of ssh://github.com/mossroy/evopedia-html5

Conflicts:
	index.html
	js/app.js
This commit is contained in:
mossroy 2013-06-08 13:00:46 +02:00
commit 0216003660

1
.gitignore vendored
View File

@ -43,3 +43,4 @@ build/config/buildinfo.properties
www-built
www-ghdeploy
/push_to_gh_pages.sh