Marc Alexander 45ba2e9770 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php

2016-07-07 19:19:40 +02:00

..

attachments.php

Merge branch '3.1.x' into 3.2.x

2016-07-07 19:19:40 +02:00

ban.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

board.php

Merge branch '3.1.x' into 3.2.x

2016-07-06 19:24:02 +02:00

bots.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

common.php

[ticket/14329] Add missing ACP language vars

2016-03-27 06:54:50 -04:00

database.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

email.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-09-24 21:24:29 +02:00

extensions.php

[ticket/13818] Add browse CDB links to ext style lang management

2015-06-06 10:30:09 -07:00

forums.php

[ticket/12807] New variables for _EXPLAIN

2014-07-06 00:28:25 +02:00

groups.php

[ticket/14253] Show group requests pending aproval at the ACP groups summary

2016-01-25 13:13:05 +01:00

index.htm

…

language.php

[ticket/13818] Add browse CDB links to ext style lang management

2015-06-06 10:30:09 -07:00

modules.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

permissions_phpbb.php

Merge branch '3.1.x'

2015-10-11 10:48:53 +02:00

permissions.php

[ticket/13302] Update documentation and support forum links to 3.1 versions.

2014-12-09 17:10:03 -08:00

posting.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

profile.php

Merge pull request #2942 from Senky/ticket/12489

2014-10-07 11:41:47 +02:00

prune.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

search.php

[ticket/11033] Update string to reflect real requirements

2014-11-22 11:56:52 +01:00

styles.php

[ticket/13818] Add browse CDB links to ext style lang management

2015-06-06 10:30:09 -07:00

users.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00