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

nbproject

neopolimatrix search on enter

2015-02-20 04:53:33 +01:00

neopolimatrix

Merge branch 'master' of mojotrollz.eu:hosting

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

system @ 5ebb40d49d

various late commits

2015-01-29 01:11:04 +01:00

.htaccess

htacess for domain, fix pics!

2015-01-23 16:08:54 +01:00

api.php

neo working

2015-01-17 21:21:28 +01:00

config.php

fb sucks huge cock

2015-01-24 05:58:59 +01:00

index.php

various late commits

2015-01-29 01:11:04 +01:00

sai.php

neo working

2015-01-17 21:21:28 +01:00

Description

No description provided

11 MiB

Languages

PHP 56.7%

Smarty 29.2%

CSS 10.2%

JavaScript 3.7%

HTML 0.2%