Marc Alexander d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2013-03-04 00:22:15 +01:00

..

attachments.php

Merge branch 'develop-olympus' into develop

2012-05-31 11:55:12 +02:00

ban.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

board.php

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

bots.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

common.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2012-12-13 19:21:29 -06:00

database.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

email.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

extensions.php

[ticket/10631] Use exceptions for errors. Build action list dynamically.

2012-09-01 15:05:34 +01:00

forums.php

[ticket/10650] Changed acp option from per forum to global

2012-04-08 10:34:44 +05:30

groups.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

index.htm

some bugfixes

2006-10-26 10:58:58 +00:00

language.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

modules.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

permissions_phpbb.php

[ticket/10679] Add new permission for changing profile field information

2012-12-06 15:10:29 +01:00

permissions.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

posting.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

profile.php

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

prune.php

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

search.php

[feature/sphinx-fulltext-search] use 9312 as default port

2012-07-27 11:10:04 +05:30

styles.php

[ticket/10161] all "e-mail" strings in language files changed to "email"

2012-04-15 20:10:51 +02:00

users.php

Merge branch 'develop-olympus' into develop

2012-07-21 16:15:42 +02:00