Marc Alexander 2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x ...

Conflicts:
	phpBB/includes/acp/acp_modules.php

2016-04-02 09:51:37 +02:00

..

convert

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

convertors

[ticket/14495] Updates the version to 3.3.0-a1-dev

2016-02-24 22:25:41 +01:00

data

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

schemas

[release-3.2.0-b2] Update versions to 3.2.0-3-dev

2016-03-07 17:36:16 +01:00

app.php

[ticket/14270] Purge cache when the installer is finished

2015-11-08 18:09:04 +01:00

index.html

[ticket/14348] Add install/index.html

2015-12-08 16:22:03 +01:00

phpbbcli.php

Merge branch '3.2.x'

2016-02-28 14:50:32 +01:00

startup.php

[ticket/14262] Move convertor to controller

2016-01-29 00:03:44 +01:00