Marc Alexander 1b85010f43 Merge remote-tracking branch 'origin' into develop-2.1.x ...

Conflicts:
	root/portal/includes/functions_upload.php

2013-01-09 17:02:41 +01:00

..

constants.php

Remove php closing tag

2011-04-07 13:14:48 +02:00

functions_modules.php

Save module settings even if module image can't be found

2012-08-11 17:28:41 +02:00

functions_upload.php

Merge remote-tracking branch 'origin' into develop-2.1.x

2013-01-09 17:02:41 +01:00

functions_version_check.php

Remove php closing tag

2011-04-07 13:14:48 +02:00

functions.php

[cleanup/tabs] Remove unnecessary tabbing in portal files

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

index.html

Start B3P v2 :-D

2009-09-03 12:48:45 +00:00