Merge branch 'master' of mojotrollz.eu:hosting

Conflicts:
	Neopolimatrix/neopolimatrix/page/default_page/tpl/default_page.tpl
This commit is contained in:
Naeltard 2015-01-23 17:21:11 +01:00
parent ccaf532b58
commit f79aa1ba75

2
system

@ -1 +1 @@
Subproject commit bde461ba8c7fed6ab4786bc0429d8b17bc0efca2
Subproject commit c2f295374bcd0bc149d608534032e786285af799