Marc Alexander 0b4eafdd9e Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs ...

Conflicts:
	root/includes/acp/acp_portal.php
	root/language/de/mods/info_acp_portal.php
	root/language/en/mods/info_acp_portal.php

2013-01-04 16:59:37 +01:00

..

adm

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

includes

Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

2013-01-04 16:59:37 +01:00

install

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

language

Merge branch 'master' of github.com:board3/Board3-Portal into cleanup/tabs

2013-01-04 16:59:37 +01:00

portal

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

styles

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00

umil

Updated UMIL to version 1.0.4;

2010-12-21 14:03:38 +00:00

portal.php

[cleanup/tabs] Remove unnecessary tabbing in portal files

2013-01-04 16:51:43 +01:00