Igor Wiedler a27a39ebed Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10046] Do not link bots to cron.php.
  [ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
  [ticket/10046] Call flush() in cron.php
  [ticket/10046] Remove calls to register_shutdown_function() in cron.php

Conflicts:
	phpBB/cron.php
	phpBB/includes/functions.php

2011-03-12 18:16:10 +01:00

..

adm

Merge branch 'develop-olympus' into develop

2011-03-02 22:08:01 -05:00

cache

…

develop

Merge branch 'ticket/9549' into develop

2011-03-01 16:57:00 -05:00

docs

Merge branch 'develop-olympus' into develop

2011-03-07 22:01:37 +01:00

download

Merge branch 'develop-olympus' into develop

2011-02-24 10:54:51 +01:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2011-03-12 18:16:10 +01:00

install

Merge branch 'develop-olympus' into develop

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

language

Merge branch 'ticket/9549' into develop

2011-03-01 16:57:00 -05:00

store

…

styles

Merge branch 'ticket/9549' into develop

2011-03-01 16:57:00 -05:00

.htaccess

…

common.php

Merge branch 'develop-olympus' into develop

2011-03-12 18:16:10 +01:00

cron.php

[ticket/10046] Call flush() in cron.php

2011-03-12 14:56:47 +01:00

faq.php

…

feed.php

Merge branch 'develop-olympus' into develop

2011-02-27 22:27:32 +01:00

index.php

[ticket/9549] Enhance teampage and legend functionality

2011-02-16 18:21:49 +01:00

mcp.php

…

memberlist.php

[ticket/9549] Display users in their primary group instead of their first group

2011-02-25 15:47:34 +01:00

posting.php

Merge branch 'develop-olympus' into develop

2011-02-20 11:40:19 -05:00

report.php

…

search.php

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

style.php

…

ucp.php

…

viewforum.php

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

viewonline.php

[ticket/9549] Enhance teampage and legend functionality

2011-02-16 18:21:49 +01:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-03-03 00:26:32 +01:00

web.config

…