Marc Alexander c260b90488 Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x ...

Conflicts:
	root/portal/modules/portal_birthday_list.php

2013-06-09 16:52:07 +02:00

..

acp

[feature/acp] Convert ACP module to new extension system

2013-03-22 13:45:56 +01:00

adm

[cleanup/whitespace] Get rid of unnecessary whitespace

2013-01-08 22:33:23 +01:00

config

[feature/controller] Add routing and services files

2013-01-09 18:22:44 +01:00

controller

[feature/acp] Convert ACP module to new extension system

2013-03-22 13:45:56 +01:00

develop

[feature/migrations] Fix minor issues in migrations data script

2013-03-08 23:22:56 +01:00

includes/trim_message

[feature/acp] Convert ACP module to new extension system

2013-03-22 13:45:56 +01:00

language

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

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

migrations

[feature/migrations] Add migrations file for Board3 Portal

2013-03-08 23:26:43 +01:00

portal

Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x

2013-06-09 16:52:07 +02:00

styles

Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x

2013-06-09 16:52:07 +02:00

composer.json

Add basic files for being an extension

2012-10-05 15:33:02 +02:00

ext.php

Add basic files for being an extension

2012-10-05 15:33:02 +02:00

portal.php

[cleanup/tabs] Remove unnecessary tabbing in portal files

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