Oleg Pudeyev f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop ...

* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php

2011-05-20 19:50:29 -04:00

..

convertors

[ticket/10045] Update version in some more files.

2011-02-16 16:06:23 +01:00

data

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

schemas

Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop

2011-05-20 19:50:29 -04:00

database_update.php

Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop

2011-05-20 19:50:29 -04:00

index.php

Merge branch 'develop-olympus' into develop

2011-05-10 23:46:24 -04:00

install_convert.php

[task/config-class] Always specify the config table to use.

2011-01-12 00:21:04 +01:00

install_install.php

Merge branch 'develop-olympus' into develop

2011-03-06 15:08:29 +01:00

install_main.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

install_update.php

[task/config-class] Always specify the config table to use.

2011-01-12 00:21:04 +01:00

phpinfo.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00