Merge branch 'eis-tasik' of http://git.opensipkd.com/project/eis into eis-tasik
Conflicts: __pycache__/__init__.cpython-34.pyc __pycache__/tools.cpython-34.pyc scripts/__pycache__/__init__.cpython-34.pyc scripts/__pycache__/initial_data.cpython-34.pyc scripts/__pycache__/initializedb.cpython-34.pyc
Showing
10 changed files
with
229 additions
and
61 deletions
-
Please register or sign in to post a comment