neopolimatrix.eu

History

messerbill 2743beba44 Merge branch 'master' of mojotrollz.eu:hosting

Conflicts:
	.gitmodules
	ourworld/config.php
	ourworld/nbproject/project.properties
	ourworld/nbproject/project.xml
	ourworld/ourworld/api/api_ourworld.php
	ourworld/ourworld/api/autoload.inc
	ourworld/ourworld/autoload.inc
	ourworld/ourworld/lib/bootstrap/css/bootstrap.css
	ourworld/ourworld/page/default_page/js/default_page.js
	ourworld/system

2015-03-03 14:32:13 +01:00

api

neopolimatrix search fix

2015-01-26 23:26:56 +01:00

dbd

neopolimatrix search fix

2015-01-26 23:26:56 +01:00

files

txt

2015-01-24 21:34:46 +01:00

lib

implemented libraries,